[beignet] 06/09: Fix shutdown order bug ("i915 kernel driver may not be sane").

[Rebecca Palmer]

This is an automated email from the git hooks/post-receive script.

rnpalmer-guest pushed a commit to branch master
in repository beignet.

commit 6155b16c7f51ec8b4c68a0c90cfd7c10ce61aa7a
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Tue Nov 10 21:39:55 2015 +0000

    Fix shutdown order bug ("i915 kernel driver may not be sane").
---
 debian/changelog                         |  1 +
 debian/patches/fix-userptr-warning.patch | 38 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6d466d8..4daba71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ beignet (1.1.1-2) UNRELEASED; urgency=medium
     use system default version. (Closes: #803643)
   * Fix two printf bugs.
   * Declare Built-Using for statically linked libclang.
+  * Fix shutdown order bug ("i915 kernel driver may not be sane").
 
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Mon, 09 Nov 2015 21:47:04 +0000
 
diff --git a/debian/patches/fix-userptr-warning.patch b/debian/patches/fix-userptr-warning.patch
new file mode 100644
index 0000000..4e0b969
--- /dev/null
+++ b/debian/patches/fix-userptr-warning.patch
@@ -0,0 +1,38 @@
+Description: Driver: fix close order
+
+Fixes the (scary but apparently harmless) warning
+Failed to release test userptr object! (9) i915 kernel driver may not be sane!
+
+It is a drm related bug. As the drm driver changed the time to free their test
+userptr to bufmgr destroy(30921483c70c6939f017476eac13da6aa26b3b3c), we need
+another order to release our driver to make sure the test userptr can be freed
+with a valid fd.
+
+Origin: upstream http://cgit.freedesktop.org/beignet/commit/?id=f48b4f6766fcaa193652fcbe6ea0bb29f92e45aa
+Author: Pan Xiuli <xiuli.pan at intel.com>
+
+diff --git a/src/intel/intel_driver.c b/src/intel/intel_driver.c
+index 507c910..035a103 100644
+--- a/src/intel/intel_driver.c
++++ b/src/intel/intel_driver.c
+@@ -85,8 +85,6 @@ intel_driver_delete(intel_driver_t *driver)
+   if (driver == NULL)
+     return;
+ 
+-  if (driver->bufmgr)
+-    drm_intel_bufmgr_destroy(driver->bufmgr);
+   cl_free(driver);
+ }
+ 
+@@ -257,6 +255,10 @@ intel_driver_open(intel_driver_t *intel, cl_context_prop props)
+ static void
+ intel_driver_close(intel_driver_t *intel)
+ {
++  //Due to the drm change about the test usrptr, we need to destroy the bufmgr
++  //befor the driver was closed, otherwise the test usrptr will not be freed.
++  if (intel->bufmgr)
++    drm_intel_bufmgr_destroy(intel->bufmgr);
+ #ifdef HAS_X11
+   if(intel->dri_ctx) dri_state_release(intel->dri_ctx);
+   if(intel->x11_display) XCloseDisplay(intel->x11_display);
+
diff --git a/debian/patches/series b/debian/patches/series
index bfc2c8f..4f067fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ llvm-36-convert-bug.patch
 llvm-37-support.patch
 printf-fix-90472.patch
 printf-fix2.patch
+fix-userptr-warning.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git