debian/changelog | 8 ++++-
debian/patches/series | 1
debian/patches/sna-fix-gen8-blt.diff | 51 +++++++++++++++++++++++++++++++++++
3 files changed, 58 insertions(+), 2 deletions(-)
New commits:
commit de69fc8c50cd0981713aec3bbafb78deabfdd4a2
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Fri Dec 12 11:10:25 2014 +0200
release to trusty
diff --git a/debian/changelog b/debian/changelog
index b3c5d88..5121f03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) trusty-proposed;
urgency=medium
* sna-fix-gen8-blt.diff: Fix GEN8 BLT with 4bit address. (LP: #1401788)
commit 1b2ea030df615244b0041c42cda65597e1f35b7c
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Fri Dec 12 11:08:22 2014 +0200
sna-fix-gen8-blt.diff: Fix GEN8 BLT with 4bit address. (LP: #1401788)
diff --git a/debian/changelog b/debian/changelog
index 74b824f..b3c5d88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) UNRELEASED; urgency=medium
+
+ * sna-fix-gen8-blt.diff: Fix GEN8 BLT with 4bit address. (LP: #1401788)
+
+ -- Timo Aaltonen <tjaal...@debian.org> Fri, 12 Dec 2014 11:06:26 +0200
+
xserver-xorg-video-intel (2:2.99.910-0ubuntu1.3) trusty-proposed;
urgency=medium
[ Maarten Lankhorst ]
diff --git a/debian/patches/series b/debian/patches/series
index fd5e9b5..98e9055 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ fix-no-backlight.diff
09-reduce-reflections-onto-rotations.diff
10-handle-rotated-slaves.diff
sna-use-vmask-in-3dstate-ps.diff
+sna-fix-gen8-blt.diff
diff --git a/debian/patches/sna-fix-gen8-blt.diff
b/debian/patches/sna-fix-gen8-blt.diff
new file mode 100644
index 0000000..2ec721d
--- /dev/null
+++ b/debian/patches/sna-fix-gen8-blt.diff
@@ -0,0 +1,51 @@
+commit 3a22b6f6d55a5b1e0a1c0a3d597996268ed439ad
+Author: Mika Kuoppala <mika.kuopp...@linux.intel.com>
+Date: Wed Nov 19 15:10:05 2014 +0200
+
+ sna: gen8 BLT broken when address has bit 4 set
+
+ With bit 4 set in address, the gen8 blitter fails and blits errorneously
+ into the cacheline preceeding the destination and similarly when reading
from
+ the source, corrupting memory.
+
+ v2: Update the destination base offset pattern as revealed
+ by igt/tests/gem_userptr_blits/destination-bo-align
+
+ v3: Check base address as well
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79053
+ Cc: Chris Wilson <ch...@chris-wilson.co.uk>
+ Tested-by: xunx.f...@intel.com [v2]
+ Signed-off-by: Mika Kuoppala <mika.kuopp...@intel.com>
+
+diff --git a/src/sna/kgem.h b/src/sna/kgem.h
+index 6adae3b..3275b4f 100644
+--- a/src/sna/kgem.h
++++ b/src/sna/kgem.h
+@@ -551,6 +551,13 @@ static inline bool kgem_bo_blt_pitch_is_ok(struct kgem
*kgem,
+ struct kgem_bo *bo)
+ {
+ int pitch = bo->pitch;
++
++ if (kgem->gen >= 0100 && pitch & (1 << 4)) { /* bdw is broken */
++ DBG(("%s: can not blt to handle=%d, pitch=%d\n",
++ __FUNCTION__, bo->handle, pitch));
++ return false;
++ }
++
+ if (kgem->gen >= 040 && bo->tiling)
+ pitch /= 4;
+ if (pitch > MAXSHORT) {
+@@ -573,6 +580,12 @@ static inline bool kgem_bo_can_blt(struct kgem *kgem,
+ return false;
+ }
+
++ if (kgem->gen >= 0100 && bo->proxy && bo->delta & (1 << 4)) {
++ DBG(("%s: can not blt to handle=%d, delta=%d\n",
++ __FUNCTION__, bo->handle, bo->delta));
++ return false;
++ }
++
+ return kgem_bo_blt_pitch_is_ok(kgem, bo);
+ }
+
commit 9e8190b2386a3054c6396b6df9ae9e010e3e57e4
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Nov 6 23:38:09 2014 +0200
fix changelog again, disable-outputs-when-slaved.patch was added in 1.2...
diff --git a/debian/changelog b/debian/changelog
index 2020080..74b824f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,6 @@
xserver-xorg-video-intel (2:2.99.910-0ubuntu1.3) trusty-proposed;
urgency=medium
[ Maarten Lankhorst ]
- * Prevent crash when using SNA with fglrx.
- - disable-outputs-when-slaved.patch
* Backport support for rotation with SNA. (LP: #1386620)
[ Timo Aaltonen ]
--
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/e1xzmju-0000hi...@moszumanska.debian.org
