From c018408402552f2b4313812e9580e6a8507ae54592f41d366c76cd341e4476ac Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Mon, 14 Sep 2015 14:56:32 +0000
Subject: [PATCH] Accepting request 330907 from
 home:jirislaby:branches:X11:XOrg

add n_i965-Remove-early-release-of-DRI2-miptree.patch (bnc#945444)

OBS-URL: https://build.opensuse.org/request/show/330907
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=472
---
 Mesa.changes                                  |  5 ++++
 Mesa.spec                                     |  4 +++
 ...Remove-early-release-of-DRI2-miptree.patch | 30 +++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 n_i965-Remove-early-release-of-DRI2-miptree.patch

diff --git a/Mesa.changes b/Mesa.changes
index ff5afa6..4a2817f 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 14 15:40:22 UTC 2015 - jslaby@suse.com
+
+- add n_i965-Remove-early-release-of-DRI2-miptree.patch (bnc#945444)
+
 -------------------------------------------------------------------
 Mon Sep 14 07:49:02 UTC 2015 - sndirsch@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index d1428fa..6d305ec 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -52,6 +52,9 @@ Source6:        %{name}-rpmlintrc
 Source7:        Mesa.keyring
 # required for building against wayland of openSUSE 13.1
 Patch0:         n_Fixed-build-against-wayland-1.2.1.patch
+# should be replaced by real patch in X+Mesa+Intel ddx
+# this is only a workaround
+Patch1:         n_i965-Remove-early-release-of-DRI2-miptree.patch
 # to be upstreamed
 Patch11:        u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
 # Patch from Fedora, fix 16bpp in llvmpipe
@@ -518,6 +521,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 # required for building against wayland of openSUSE 13.1
 %patch0 -p1
 %endif
+%patch1 -p1
 ### disabled, but not dropped yet; these still need investigation in
 ### order to figure out whether the issue is still reproducable and
 ### hence a fix is required
diff --git a/n_i965-Remove-early-release-of-DRI2-miptree.patch b/n_i965-Remove-early-release-of-DRI2-miptree.patch
new file mode 100644
index 0000000..6ac084e
--- /dev/null
+++ b/n_i965-Remove-early-release-of-DRI2-miptree.patch
@@ -0,0 +1,30 @@
+From e2a696a4cd93c2dbe445243de48ed478fbdb8009 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri, 10 Jul 2015 10:41:35 +0100
+Subject: i965: Remove early release of DRI2 miptree
+References: bfo#86281 bko#349519
+
+intel_update_winsys_renderbuffer_miptree() will release the existing
+miptree when wrapping a new DRI2 buffer, so we can remove the early
+release and so prevent a NULL mt dereference should importing the new
+DRI2 name fail for any reason. (Reusing the old DRI2 name will result
+in the rendering going astray, to a stale buffer, and not shown on the
+screen, but it allows us to issue a warning and not crash much later in
+innocent code.)
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+---
+ src/mesa/drivers/dri/i965/brw_context.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/src/mesa/drivers/dri/i965/brw_context.c
++++ b/src/mesa/drivers/dri/i965/brw_context.c
+@@ -1417,7 +1417,6 @@ intel_process_dri2_buffer(struct brw_con
+               buffer->cpp, buffer->pitch);
+    }
+ 
+-   intel_miptree_release(&rb->mt);
+    bo = drm_intel_bo_gem_create_from_name(brw->bufmgr, buffer_name,
+                                           buffer->name);
+    if (!bo) {