debian/changelog | 27 ++++++++++-
debian/patches/series | 2
debian/patches/sna-check-for-system-memory-contents.diff | 35 +++++++++++++++
3 files changed, 61 insertions(+), 3 deletions(-)
New commits:
commit 2c74f66eebee681ffe0d1e4d085a74760b449991
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Aug 20 14:16:36 2015 +0300
release to wily
diff --git a/debian/changelog b/debian/changelog
index e65da47..921859e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu1) UNRELEASED;
urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu1) wily; urgency=medium
[ Robert Hooker ]
* Merge from debian-experimental
@@ -13,7 +13,7 @@ xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu1)
UNRELEASED; urgency=m
* sna-check-for-system-memory-contents.diff: Fix corruption on
lightdm, while logging in and blank background on unity.
- -- Robert Hooker <sarv...@ubuntu.com> Wed, 19 Aug 2015 00:42:34 -0400
+ -- Timo Aaltonen <tjaal...@debian.org> Thu, 20 Aug 2015 14:14:34 +0300
xserver-xorg-video-intel (2:2.99.917+git20150808-1~exp1) UNRELEASED;
urgency=medium
commit bd507c837a9cf766dc5493d3739e296aa1f37edf
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Aug 20 14:14:31 2015 +0300
don't forget to add the patch
diff --git a/debian/patches/sna-check-for-system-memory-contents.diff
b/debian/patches/sna-check-for-system-memory-contents.diff
new file mode 100644
index 0000000..7fbdf1e
--- /dev/null
+++ b/debian/patches/sna-check-for-system-memory-contents.diff
@@ -0,0 +1,35 @@
+commit 78f7451886f0a33df717c57fc1a079ee7e6f221e
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Thu Aug 20 10:43:05 2015 +0100
+
+ sna: Check for system memory contents when looking for empty sources
+
+ Fixes a regression from
+ commit 3f128867d957e30690218404337b00bb327e647b
+ Author: Chris Wilson <ch...@chris-wilson.co.uk>
+ Date: Fri Aug 7 15:19:17 2015 +0100
+
+ sna: Skip a no-op copy
+
+ that forgot that we can flush damage but still have valid contents to
+ copy from.
+
+ Reported-by: Timo Aaltonen <tjaal...@ubuntu.com>
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index c624d9e..937d6a8 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -6446,8 +6446,9 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr
gc,
+ assert(region_num_rects(region));
+
+ if (src_priv &&
+- src_priv->gpu_damage == NULL &&
+- src_priv->cpu_damage == NULL) {
++ src_priv->gpu_bo == NULL &&
++ src_priv->cpu_bo == NULL &&
++ src_priv->ptr == NULL) {
+ /* Rare but still happens, nothing to copy */
+ DBG(("%s: src pixmap=%ld is empty\n",
+ __FUNCTION__, src_pixmap->drawable.serialNumber));
commit 91a8056d9e59027908b70855310db88f037371f3
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Aug 20 14:12:51 2015 +0300
add changelog for 2:2.99.917-1ubuntu1 back
diff --git a/debian/changelog b/debian/changelog
index 04a4172..e65da47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,24 @@ xserver-xorg-video-intel (2:2.99.917-2) unstable;
urgency=medium
-- Vincent Cheng <vch...@debian.org> Thu, 16 Jul 2015 01:00:41 -0700
+xserver-xorg-video-intel (2:2.99.917-1ubuntu1) wily; urgency=medium
+
+ * Merge with Debian, remaining Ubuntu changes:
+ * debian/rules:
+ - Fix valgrind-enabling check (DEB_HOST_ARCH_OS instead of DEB_HOST_ARCH)
+ - Use SNA by default.
+ * debian/patches/fix-sna-external-slave-rotation.patch:
+ - Fix rotating external display with optimus results in corruption.
+ * debian/patches/fix-sna-fstat-include.patch:
+ * debian/patches/fix-uxa-fstat-include.patch:
+ - Fix missing include for fstat
+ * debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch:
+ - Fix faulty yuv2rgb translation on Intel Generation 8 Graphics.
+ * debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff:
+ - Fix rotation on SKL.
+
+ -- Robert Ancell <robert.anc...@canonical.com> Tue, 14 Jul 2015 15:21:57
+1200
+
xserver-xorg-video-intel (2:2.99.917-1) unstable; urgency=medium
* Upload to unstable. (Closes: #748753)
commit 76fc9825aa416165349f5d588317f694e9955272
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Aug 20 14:04:15 2015 +0300
sna-check-for-system-memory-contents.diff: Fix corruption on lightdm, while
logging in and blank background on unity.
diff --git a/debian/changelog b/debian/changelog
index 0e7222c..04a4172 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu1) UNRELEASED;
urgency=medium
+ [ Robert Hooker ]
* Merge from debian-experimental
- debian/patches/fix-sna-external-slave-rotation.patch
debian/patches/fix-sna-fstat-include.patch
@@ -8,6 +9,10 @@ xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu1)
UNRELEASED; urgency=m
debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff
Drop all upstream patches.
+ [ Timo Aaltonen ]
+ * sna-check-for-system-memory-contents.diff: Fix corruption on
+ lightdm, while logging in and blank background on unity.
+
-- Robert Hooker <sarv...@ubuntu.com> Wed, 19 Aug 2015 00:42:34 -0400
xserver-xorg-video-intel (2:2.99.917+git20150808-1~exp1) UNRELEASED;
urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index 792f381..bddf279 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-#no patches
+sna-check-for-system-memory-contents.diff
