debian/changelog | 7 ++
debian/patches/i965-dont-call-abort-on-unknown-dev.diff | 46 ++++++++++++++++
debian/patches/series | 1
3 files changed, 54 insertions(+)
New commits:
commit cb760b097ec5ee476cea49f186c818d0386af79c
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Wed Apr 9 13:16:37 2014 +0300
release to trusty
diff --git a/debian/changelog b/debian/changelog
index 0d37066..efe0188 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.1.0-4ubuntu3) UNRELEASED; urgency=medium
+mesa (10.1.0-4ubuntu3) trusty; urgency=medium
* i965-dont-call-abort-on-unknown-dev.diff: Allow using a fallback
driver when the native one doesn't support the device.
commit 3abaa341228444581f65109650dc877ac00c1711
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Wed Apr 9 13:16:14 2014 +0300
i965-dont-call-abort-on-unknown-dev.diff: Allow using a fallback driver
when the native one doesn't support the device.
diff --git a/debian/changelog b/debian/changelog
index 9d46d59..0d37066 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.0-4ubuntu3) UNRELEASED; urgency=medium
+
+ * i965-dont-call-abort-on-unknown-dev.diff: Allow using a fallback
+ driver when the native one doesn't support the device.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 09 Apr 2014 12:42:49 +0300
+
mesa (10.1.0-4ubuntu2) trusty; urgency=medium
* fix-kwin.diff: i965; Don't check reset status on gen4/5. (LP: #1299499)
diff --git a/debian/patches/i965-dont-call-abort-on-unknown-dev.diff
b/debian/patches/i965-dont-call-abort-on-unknown-dev.diff
new file mode 100644
index 0000000..7056390
--- /dev/null
+++ b/debian/patches/i965-dont-call-abort-on-unknown-dev.diff
@@ -0,0 +1,46 @@
+commit eaf3358e0a1323ed417b6875e70fdcdc30ed97e0
+Author: Kenneth Graunke <kenn...@whitecape.org>
+Date: Mon Feb 10 01:54:23 2014 -0800
+
+ i965: Don't call abort() on an unknown device.
+
+ If we don't recognize the PCI ID, we can't reasonably load the driver.
+ However, calling abort() is quite rude - it means the application that
+ tried to initialize us (possibly the X server) can't continue via
+ fallback paths. We already have a more polite mechanism - failing to
+ create the context. So, just use that.
+
+ While we're at it, improve the error message.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73024
+ Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
+ Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
+ Tested-by: Lu Hua <huax...@intel.com>
+
+diff --git a/src/mesa/drivers/dri/i965/brw_device_info.c
b/src/mesa/drivers/dri/i965/brw_device_info.c
+index eb1df79..d931091 100644
+--- a/src/mesa/drivers/dri/i965/brw_device_info.c
++++ b/src/mesa/drivers/dri/i965/brw_device_info.c
+@@ -229,7 +229,7 @@ brw_get_device_info(int devid)
+ #define CHIPSET(id, family, name) case id: return &brw_device_info_##family;
+ #include "pci_ids/i965_pci_ids.h"
+ default:
+- fprintf(stderr, "Unknown Intel device.");
+- abort();
++ fprintf(stderr, "i965_dri.so does not support the 0x%x PCI ID.\n",
devid);
++ return NULL;
+ }
+ }
+diff --git a/src/mesa/drivers/dri/i965/intel_screen.c
b/src/mesa/drivers/dri/i965/intel_screen.c
+index 6ab3609..acdb5f3 100644
+--- a/src/mesa/drivers/dri/i965/intel_screen.c
++++ b/src/mesa/drivers/dri/i965/intel_screen.c
+@@ -1328,6 +1328,8 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp)
+
+ intelScreen->deviceID =
drm_intel_bufmgr_gem_get_devid(intelScreen->bufmgr);
+ intelScreen->devinfo = brw_get_device_info(intelScreen->deviceID);
++ if (!intelScreen->devinfo)
++ return false;
+
+ intelScreen->hw_must_use_separate_stencil = intelScreen->devinfo->gen >= 7;
+
diff --git a/debian/patches/series b/debian/patches/series
index f5cf97e..bc6548d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ egl-platform-mir.patch
i915-dont-default-to-2.1.patch
fix-bsymbolic-madness.patch
fix-kwin.diff
+i965-dont-call-abort-on-unknown-dev.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wxpz1-0000uw...@moszumanska.debian.org
