fix bug with glamor and PRIME where server would crash
This commit is contained in:
parent
0a05356996
commit
f91a58a800
34
0001-glamor-make-current-in-prepare-paths.patch
Normal file
34
0001-glamor-make-current-in-prepare-paths.patch
Normal file
@ -0,0 +1,34 @@
|
||||
From 422a9f7f37eb6027fa4d20a4be208978832be6d6 Mon Sep 17 00:00:00 2001
|
||||
From: Dave Airlie <airlied@redhat.com>
|
||||
Date: Wed, 15 Jul 2015 17:54:03 +1000
|
||||
Subject: [PATCH] glamor: make current in prepare paths
|
||||
|
||||
Lots of the accel paths only make current once they start
|
||||
doing someting, so a lot of them call the bail paths without
|
||||
make current, which means on PRIME systems for example
|
||||
we end up in the wrong context.
|
||||
|
||||
Add a prepare pixmap in the prepare fallback path.
|
||||
|
||||
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90667
|
||||
Signed-off-by: Dave Airlie <airlied@redhat.com>
|
||||
---
|
||||
glamor/glamor_prepare.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/glamor/glamor_prepare.c b/glamor/glamor_prepare.c
|
||||
index 9bfc557..68fb58f 100644
|
||||
--- a/glamor/glamor_prepare.c
|
||||
+++ b/glamor/glamor_prepare.c
|
||||
@@ -45,6 +45,8 @@ glamor_prep_pixmap_box(PixmapPtr pixmap, glamor_access_t access, BoxPtr box)
|
||||
if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(priv))
|
||||
return TRUE;
|
||||
|
||||
+ glamor_make_current(glamor_priv);
|
||||
+
|
||||
RegionInit(®ion, box, 1);
|
||||
|
||||
/* See if it's already mapped */
|
||||
--
|
||||
2.4.3
|
||||
|
@ -45,7 +45,7 @@
|
||||
Summary: X.Org X11 X server
|
||||
Name: xorg-x11-server
|
||||
Version: 1.17.2
|
||||
Release: 1%{?gitdate:.%{gitdate}}%{dist}
|
||||
Release: 2%{?gitdate:.%{gitdate}}%{dist}
|
||||
URL: http://www.x.org
|
||||
License: MIT
|
||||
Group: User Interface/X
|
||||
@ -107,6 +107,8 @@ Patch10006: 0003-systemd-logind-Only-use-systemd-logind-integration-t.patch
|
||||
Patch10010: 0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
|
||||
Patch10011: 0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
|
||||
|
||||
Patch10020: 0001-glamor-make-current-in-prepare-paths.patch
|
||||
|
||||
%global moduledir %{_libdir}/xorg/modules
|
||||
%global drimoduledir %{_libdir}/dri
|
||||
%global sdkdir %{_includedir}/xorg
|
||||
@ -644,6 +646,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jul 15 2015 Dave Airlie <airlied@redhat.com> 1.17.2-2
|
||||
- fix bug with glamor and PRIME where server would crash
|
||||
|
||||
* Tue Jun 16 2015 Adam Jackson <ajax@redhat.com> 1.17.2-1
|
||||
- xserver 1.17.2
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user