Add patch for bug #393427

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 62 insertions, 5 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/Manifest b/x11-drivers/xf86-video-intel/Manifest
index d60afe180d88..e87099ef3685 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -2,6 +2,7 @@ AUX 2.10.0-0001-Extract-pixel-value-for-all-formats-to-avoid-hitting.patch 3943
 AUX xf86-video-intel-2.15-batch-overrun.patch 882 RMD160 203f4f92a7bffef0f900ccc8f5c81cd69a975dcb SHA1 fc3f100a57dc52c06b7f2109aba774bb3abcef93 SHA256 5044689aaefa4c3416c8e8d70d0765b8b149a8352b3992cb405d3a280d9f495f
 AUX xf86-video-intel-2.15-unsigned-promotion.patch 1207 RMD160 19b3eb510411d1c0d70df793b7d1525828c4035d SHA1 5505becb9bea0391d6441aa070ade16dc01f48d8 SHA256 c61713af565c8ce55d4c00dbfe24380ed6952698df1bf3070813db953b979102
 AUX xf86-video-intel-2.17-sna-offsets.patch 1062 RMD160 23f2a6038b00421d5d88433e69cd5af47731fd9b SHA1 268d7801436cac6921d016d4c755a8670a9f31ba SHA256 26ad750c57220a11875ebf4bb1665cf748c9da12af9c0eade12609559de06041
+AUX xf86-video-intel-2.17-sna-pipeline-flush.patch 1634 RMD160 a6ca8155a72594119c0479857eb782cc0082833c SHA1 9563853e00bc0bd1c3425e34c24d74c07ab430d4 SHA256 c9605db58f8a2849061b837807bf30bb85a021ea98de2976aefa8bb533d8106e
 DIST xf86-video-intel-2.10.0.tar.bz2 885299 RMD160 e37d47758231d61d99fa65873884727b44623c33 SHA1 1683eddf89ed88f109cb2fe46284e3f8f304a0d9 SHA256 e46dd691dc93db7cd6f5f22b84fea7e9f4bfd34f28026cfd680993b3ccfc48ab
 DIST xf86-video-intel-2.11.0.tar.bz2 871551 RMD160 a857942e7eacd9e7c517c485fb6e400103e238f3 SHA1 f25eb8619ac7c107fdcee525388a8a03dd62719b SHA256 db292cbc25f3b132357795697a61c5ec6f08cb041a2cb6fd081298306f4f5a4f
 DIST xf86-video-intel-2.13.0.tar.bz2 917026 RMD160 565c3b58938ac392d7a4322ba51aabdc9e229606 SHA1 1b2aebd444bcfc371a55af8910eb4d5928eab5c9 SHA256 d8b2fae8d0c4ae372994cb7df8de8aa995b8e89b1bc5766c53ea0751752fc887
@@ -17,8 +18,8 @@ EBUILD xf86-video-intel-2.13.0.ebuild 1363 RMD160 b298e5314ea68e77c783b58d54f58f
 EBUILD xf86-video-intel-2.14.0.ebuild 1363 RMD160 79ee67e89f8315e9659db2d04c3b11e5ea428c33 SHA1 0eeb6467fd552adc526f0624f9173faf381c9897 SHA256 2f39c7cb5763dbe2206533bcf7df2dfb22dd70dd0e7c2253ecfdf428381c5c7e
 EBUILD xf86-video-intel-2.15.0-r1.ebuild 1273 RMD160 56d437abd6bcd7e48aa0b7c65fe9ea95993ac77f SHA1 e981a9a15d809d18bed2376f9c823cb775553bea SHA256 20a844125ed83f0e00eceda9d83562ccb12d31e0131a1263bdc8c8be4f68a59b
 EBUILD xf86-video-intel-2.16.0.ebuild 1234 RMD160 dbb8179ee3add4d8fb87f9a03ca4e4e2feea0b9b SHA1 6c69aad59f414688c3d28277987b4382dacbd167 SHA256 40fdcf06bb64a44208034b4f1723a80756dd46bd72cb1ef56a27589af26e0abf
-EBUILD xf86-video-intel-2.17.0-r2.ebuild 1364 RMD160 cd8e7f2a57725ca2f1b742454d33c4040269d7c2 SHA1 10b9cacd4cec36f05a310ed9c34c1f30a35e8a45 SHA256 81e41057adea8b6a80ecfa4c6c8c38bfd48739f4e4025cf3b5edb45dda905d32
+EBUILD xf86-video-intel-2.17.0-r3.ebuild 1408 RMD160 5fa893f2ffccdd6ad643d1c67c6c50f0985164ed SHA1 ca652c58c13f2508a67eb731b371247c4c75b06a SHA256 fa4dab42ff6bf4cae7f051ae3a275368ec7e87f35f0ff06e1fb43d16c02c4af3
 EBUILD xf86-video-intel-2.8.1.ebuild 810 RMD160 f516c452a6b13354529fa47a93fe3bfabb77e4a0 SHA1 a5764d81c92ed60cedce493dc5a1770d156e0779 SHA256 e022006015034d3c2481a670df34668ae48a82fe12d5c6476e72aa21ede0453f
 EBUILD xf86-video-intel-2.9.1.ebuild 791 RMD160 f484b870054546af768f122e86787540a653c471 SHA1 86d4e85846eb9c22073210bb16beb21c073e5603 SHA256 a324cb9bcb34cb8d05b749052d3253230f04e8f7c4f4ac7ccd53615130a9b170
-MISC ChangeLog 43624 RMD160 caee9d852c7c99e30bb8f2be96ad4605edccdd8d SHA1 18ac2d42e81b48534761184bc2fcbafaaf77bc9b SHA256 d1b249fa6adb5d3b1c93f9fe4891adc48344f230732c077f8e90826462de62d7
+MISC ChangeLog 43896 RMD160 8b22f2f45f8851c20d6d6b71739457c0dfffc21f SHA1 e9a9bf321bce9348060dba3fb8397fb5714baa4f SHA256 31b252ab75ad13b81bd23f93bc958b7fe0c41cb1f2dcd6d762bce21967a6086e
 MISC metadata.xml 283 RMD160 e7fecb8c9f42c160464e04cbad8453fa5ae5f082 SHA1 0405010812eb8926276f73f0f5129d889d89ac06 SHA256 0b173562be9c319a1c2475b8f7c96112574a68c1fabad605c78d5068276ee82a
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() {