rpms/mesa
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Fix up intelInitScreen2 for DRI3 (RHBZ #1115323) (patch from drago01)

Browse Source 
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
This commit is contained in:
Igor Gnatenko 2014-07-04 00:26:07 +04:00
parent d3fa447215
commit dbe5a2835d
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0001-i915-Fix-up-intelInitScreen2-for-DRI3.patch Normal file
View File

@ -0,0 +1,40 @@
From ea3ade19e2170bd67c3d5448fc38747b8e380d5a Mon Sep 17 00:00:00 2001
From: Adel Gadllah <adel.gadllah@gmail.com>
Date: Thu, 3 Jul 2014 22:13:53 +0200
Subject: [PATCH] i915: Fix up intelInitScreen2 for DRI3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Commit 442442026eb updated both i915 and i965 for DRI3 support,
but one check in intelInitScreen2 was missed for i915 causing crashes
when trying to use i915 with DRI3.
So fix that up.
Reported-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Tested-by: František Zatloukal <Zatloukal.Frantisek@gmail.com>
Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1115323
Cc: "10.2" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com>
---
src/mesa/drivers/dri/i915/intel_screen.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index 9b4e490..4c9726c 100644
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -1152,7 +1152,8 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp)
{
struct intel_screen *intelScreen;
- if (psp->dri2.loader->base.version <= 2 ||
+ if (psp->image.loader) {
+ } else if (psp->dri2.loader->base.version <= 2 ||
psp->dri2.loader->getBuffersWithFormat == NULL) {
fprintf(stderr,
"\nERROR! DRI2 loader with getBuffersWithFormat() "
--
2.0.0

9
mesa.spec
View File

@ -59,7 +59,7 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 10.2.2
Release: 2.%{gitdate}%{?dist}
Release: 3.%{gitdate}%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@ -83,6 +83,9 @@ Patch20: mesa-10.2-evergreen-big-endian.patch
# dri3 GLX_INTEL_swap_event fix
Patch30: 0001-glxext-Send-the-Drawable-s-ID-in-the-GLX_BufferSwapC.patch
# http://lists.freedesktop.org/archives/mesa-dev/2014-July/062741.html
# https://bugzilla.redhat.com/show_bug.cgi?id=1115323
Patch31: 0001-i915-Fix-up-intelInitScreen2-for-DRI3.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=73512
Patch99: 0001-opencl-use-versioned-.so-in-mesa.icd.patch
@ -351,6 +354,7 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1
%patch20 -p1 -b .egbe
%patch30 -p1 -b .dri3fix
%patch31 -p1 -b .dri3fix
%if 0%{?with_opencl}
%patch99 -p1 -b .icd
@ -679,6 +683,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Fri Jul 04 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2.2-3.20140625
- Fix up intelInitScreen2 for DRI3 (RHBZ #1115323) (patch from drago01)
* Fri Jun 27 2014 Dave Airlie <airlied@redhat.com> 10.2.2-2.20140625
- add dri3 gnome-shell startup fix from Jasper.