xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog | 6 ++++++
debian/patches/series | 1 +
debian/patches/sna-freescreen.diff | 19 +++++++++++++++++++
3 files changed, 26 insertions(+)
New commits:
commit 1d46b5e060c9b3cf232267514c8a2b30141cab4b
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Sep 22 15:29:40 2014 +0200
Add patch to enable SNA with fglrx. (LP: #1359105)
diff --git a/debian/changelog b/debian/changelog
index bdadd00..dc2fe67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu3) utopic; urgency=medium
+
+ * Add patch to enable SNA with fglrx. (LP: #1359105)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 22 Sep 2014 15:29:05 +0200
+
xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu2) utopic; urgency=medium
* Rebuild for xorg 1.16 abi.
diff --git a/debian/patches/series b/debian/patches/series
index 8582ca8..1786fa5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ dri3-flush-broken.patch
# XMir series
xmir.patch
+sna-freescreen.diff
diff --git a/debian/patches/sna-freescreen.diff b/debian/patches/sna-freescreen.diff
new file mode 100644
index 0000000..d9a2603
--- /dev/null
+++ b/debian/patches/sna-freescreen.diff
@@ -0,0 +1,19 @@
+commit f5469681b620d9d6ccaf53e92ed31f931cb03b0d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Aug 18 14:37:44 2014 +0100
+
+ sna: Be defensive during FreeScreen()
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+--- a/src/sna/sna_driver.c
++++ b/src/sna/sna_driver.c
+@@ -1190,7 +1190,7 @@
+ struct sna *sna = to_sna(scrn);
+
+ DBG(("%s\n", __FUNCTION__));
+- if ((uintptr_t)sna & 1)
++ if (sna == NULL || (uintptr_t)sna & 3) /* beware thieves */
+ return;
+
+ scrn->driverPrivate = (void *)((uintptr_t)sna->info | (sna->flags & SNA_IS_SLAVED) | 2);
Reply to: