Add patch to fix screen corruption, bug #391819.

(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)

3 files changed, 40 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 432f8613ecf1..2d16ad5c19df 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.76 2011/11/17 17:45:18 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.77 2011/11/25 23:30:18 chithanh Exp $
+
+*xf86-video-intel-2.17.0-r1 (25 Nov 2011)
+
+  25 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -xf86-video-intel-2.17.0.ebuild, +xf86-video-intel-2.17.0-r1.ebuild,
+  +files/xf86-video-intel-2.17-sna-offsets.patch:
+  Add patch to fix screen corruption, bug #391819.
 
 *xf86-video-intel-2.17.0 (17 Nov 2011)
 
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.17-sna-offsets.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.17-sna-offsets.patch
new file mode 100644
index 000000000000..1e4ec4ce698b
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.17-sna-offsets.patch
@@ -0,0 +1,31 @@
+From 16f5e224dcfd97012b38ee1af6c72dbe3c0f3304 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri, 25 Nov 2011 16:21:41 +0000
+Subject: sna: Avoid the double application of drawable offsets for tiled spans
+
+As we handle tiled spans indirectly, we need to avoid applying the
+drawable offsets twice (once in the mi layer generating the spans, and
+then once more in the tiled rect renderer).
+
+Reported-by: Ulrich Müller <ulm@gentoo.org>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43245
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index 1a35c4d..03020c9 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -2790,9 +2790,9 @@ sna_fill_spans(DrawablePtr drawable, GCPtr gc, int n,
+ 				return;
+ 
+ 			for (i = 0; i < n; i++) {
+-				rect[i].x = pt[i].x;
++				rect[i].x = pt[i].x - drawable->x;
+ 				rect[i].width = width[i];
+-				rect[i].y = pt[i].y;
++				rect[i].y = pt[i].y - drawable->y;
+ 				rect[i].height = 1;
+ 			}
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0-r1.ebuild
index 20c1892254ec..bc1281e6954b 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0.ebuild,v 1.1 2011/11/17 17:45:18 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0-r1.ebuild,v 1.1 2011/11/25 23:30:18 chithanh Exp $
 
 EAPI=4