[beignet] 04/05: Fix FTBFS with drm 2.4.71

[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 467d95121566c05ffbcba93b312a68262b29e9bd
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Sat Oct 8 12:22:55 2016 +0100

    Fix FTBFS with drm 2.4.71
    
    Closes: #840107
---
 debian/changelog                           |  1 +
 debian/patches/drm2471-pooled_eu-fix.patch | 31 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c953017..041e06e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ beignet (1.2.0-2) UNRELEASED; urgency=medium
     for upstream compatibility, and enable PIE.
   * Update documentation, fix spelling and grammar.
   * Add clGetKernelSubGroupInfoKHR to _cl_icd_dispatch table.
+  * Fix FTBFS with drm 2.4.71.  (Closes: #840107)
 
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Sun, 25 Sep 2016 21:58:07 +0100
 
diff --git a/debian/patches/drm2471-pooled_eu-fix.patch b/debian/patches/drm2471-pooled_eu-fix.patch
new file mode 100644
index 0000000..10495af
--- /dev/null
+++ b/debian/patches/drm2471-pooled_eu-fix.patch
@@ -0,0 +1,31 @@
+Description: Fix FTBFS with drm 2.4.71
+
+beignet started using drm_intel_get_pooled_eu and drm_intel_get_min_eu_in_pool
+if available early in their development, before their interface was finalized.
+
+Author: Armin Krejzi, Rebecca Palmer
+Origin: https://lists.freedesktop.org/archives/beignet/2016-October/008041.html
+Bug-Debian: https://bugs.debian.org/840107
+
+--- beignet-1.2.0.orig/src/intel/intel_driver.c
++++ beignet-1.2.0/src/intel/intel_driver.c
+@@ -890,13 +890,16 @@ intel_update_device_info(cl_device_id de
+ #ifdef HAS_POOLED_EU
+   /* BXT pooled eu, 3*6 to 2*9, like sub slice count is 2 */
+   unsigned int has_pooled_eu = 0;
+-  if(!drm_intel_get_pooled_eu(driver->fd, &has_pooled_eu) && has_pooled_eu)
++  if(drm_intel_get_pooled_eu(driver->fd) > 0) {
+     device->sub_slice_count = 2;
++    has_pooled_eu = 1;
++    }
+ 
+ #ifdef HAS_MIN_EU_IN_POOL
+-  unsigned int min_eu;
++  int min_eu;
+   /* for fused down 2x6 devices, beignet don't support. */
+-  if (has_pooled_eu && !drm_intel_get_min_eu_in_pool(driver->fd, &min_eu)) {
++  if (has_pooled_eu) {
++    min_eu = drm_intel_get_min_eu_in_pool(driver->fd);
+     assert(min_eu == 9); //don't support fuse down device.
+   }
+ #endif //HAS_MIN_EU_IN_POOL
diff --git a/debian/patches/series b/debian/patches/series
index 33d266e..a388ea4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ pow-powr-tests.patch
 llvm39-support.patch
 extend_cl_icd_dispatch.patch
 spelling.patch
+drm2471-pooled_eu-fix.patch

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