Add patch for bug #393427

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

3 files changed, 59 insertions, 3 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 15eb600f0c21..811fe3df7a29 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.78 2011/11/26 15:32:22 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.79 2011/12/11 16:00:28 chithanh Exp $
+
+*xf86-video-intel-2.17.0-r3 (11 Dec 2011)
+
+  11 Dec 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -xf86-video-intel-2.17.0-r2.ebuild, +xf86-video-intel-2.17.0-r3.ebuild,
+  +files/xf86-video-intel-2.17-sna-pipeline-flush.patch:
+  Add patch for bug #393427
 
 *xf86-video-intel-2.17.0-r2 (26 Nov 2011)
 
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.17-sna-pipeline-flush.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.17-sna-pipeline-flush.patch
new file mode 100644
index 000000000000..d1f7e75614ef
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.17-sna-pipeline-flush.patch
@@ -0,0 +1,48 @@
+From a5353a7c1d1f02b887f61f543c8e4bd4e8bd104f Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon, 21 Nov 2011 10:58:17 +0000
+Subject: sna/gen4: Use the special composite rect emission for fill_one()
+
+In order to workaround a bug in the shaders on gen4, we need to flush
+the pipeline after every rectangle. The recently introduced fill-one
+mechanism for gen4, missed this vital step triggering a random hang with
+an otherwise sane batchbuffer (the missing flush is hard to spot!).
+
+Fixes regression from 86f99379ee5 (sna/gen4: Add fill-one).
+
+Reported-by: Albert Damen <albrt@gmx.net>
+Reported-by: Fryderyk Dziarmagowski <fdziarmagowski@gmail.com>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43083
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
+index c0a32a4..dbb7c43 100644
+--- a/src/sna/gen4_render.c
++++ b/src/sna/gen4_render.c
+@@ -2662,23 +2662,7 @@ gen4_render_fill_one(struct sna *sna, PixmapPtr dst, struct kgem_bo *bo,
+ 	gen4_fill_bind_surfaces(sna, &tmp);
+ 	gen4_align_vertex(sna, &tmp);
+ 
+-	if (!gen4_get_rectangles(sna, &tmp, 1)) {
+-		gen4_fill_bind_surfaces(sna, &tmp);
+-		gen4_get_rectangles(sna, &tmp, 1);
+-	}
+-
+-	DBG(("	(%d, %d), (%d, %d)\n", x1, y1, x2, y2));
+-	OUT_VERTEX(x2, y2);
+-	OUT_VERTEX_F(1);
+-	OUT_VERTEX_F(1);
+-
+-	OUT_VERTEX(x1, y2);
+-	OUT_VERTEX_F(0);
+-	OUT_VERTEX_F(1);
+-
+-	OUT_VERTEX(x1, y1);
+-	OUT_VERTEX_F(0);
+-	OUT_VERTEX_F(0);
++	gen4_render_fill_rectangle(sna, &tmp, x1, y1, x2 - x1, y2 - y1);
+ 
+ 	gen4_vertex_flush(sna);
+ 	kgem_bo_destroy(&sna->kgem, tmp.src.bo);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0-r2.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0-r3.ebuild
index 6e9985fb3c81..c04819aa7b8b 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0-r2.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0-r3.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-r2.ebuild,v 1.1 2011/11/26 15:32:22 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0-r3.ebuild,v 1.1 2011/12/11 16:00:28 chithanh Exp $
 
 EAPI=4
 
@@ -26,7 +26,8 @@ DEPEND="${RDEPEND}
 	>=x11-proto/dri2proto-2.6"
 
 PATCHES=(
-        "${FILESDIR}"/${PN}-2.17-sna-offsets.patch
+	"${FILESDIR}"/${PN}-2.17-sna-offsets.patch
+	"${FILESDIR}"/${PN}-2.17-sna-pipeline-flush.patch
 )
 
 pkg_setup() {