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

[Igor Gnatenko]

commit dbe5a2835d1fb966f2aa0aa341cfb5917d91d567
Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date:   Fri Jul 4 00:26:07 2014 +0400

    Fix up intelInitScreen2 for DRI3 (RHBZ #1115323) (patch from drago01)
    
    Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>

 0001-i915-Fix-up-intelInitScreen2-for-DRI3.patch |   40 ++++++++++++++++++++++
 mesa.spec                                        |    9 ++++-
 2 files changed, 48 insertions(+), 1 deletions(-)
---
diff --git a/0001-i915-Fix-up-intelInitScreen2-for-DRI3.patch b/0001-i915-Fix-up-intelInitScreen2-for-DRI3.patch
new file mode 100644
index 0000000..f959c48
--- /dev/null
+++ b/0001-i915-Fix-up-intelInitScreen2-for-DRI3.patch
@@ -0,0 +1,40 @@
+From ea3ade19e2170bd67c3d5448fc38747b8e380d5a Mon Sep 17 00:00:00 2001
+From: Adel Gadllah <adel.gadllah at 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 at gmail.com>
+Tested-by: František Zatloukal <Zatloukal.Frantisek at gmail.com>
+Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1115323
+Cc: "10.2" <mesa-stable at lists.freedesktop.org>
+Signed-off-by: Adel Gadllah <adel.gadllah at 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
+
diff --git a/mesa.spec b/mesa.spec
index f2d572e..cdfdde3 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -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 at gmail.com> - 10.2.2-3.20140625
+- Fix up intelInitScreen2 for DRI3 (RHBZ #1115323) (patch from drago01)
+
 * Fri Jun 27 2014 Dave Airlie <airlied at redhat.com> 10.2.2-2.20140625
 - add dri3 gnome-shell startup fix from Jasper.