Add patches to fix segfault, bug #366091, upstream #36319.

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

5 files changed, 76 insertions, 4 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index d9d2d1e0a4cf..a26981bc2cea 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,14 @@
 # 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.67 2011/04/18 09:35:32 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.68 2011/06/08 09:41:59 chithanh Exp $
+
+*xf86-video-intel-2.15.0-r1 (08 Jun 2011)
+
+  08 Jun 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -xf86-video-intel-2.15.0.ebuild, +xf86-video-intel-2.15.0-r1.ebuild,
+  +files/xf86-video-intel-2.15-batch-overrun.patch,
+  +files/xf86-video-intel-2.15-unsigned-promotion.patch:
+  Add patches to fix segfault, bug #366091, upstream #36319.
 
 *xf86-video-intel-2.15.0 (18 Apr 2011)
 
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 60374fc314f0..ef73e6db2e71 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,4 +1,6 @@
 AUX 2.10.0-0001-Extract-pixel-value-for-all-formats-to-avoid-hitting.patch 3943 RMD160 edfc2294341ff7c314e87e82ec95ceff920585ca SHA1 b1c9bcfe6b48a0f7426fbdb3c862a121f81a58e7 SHA256 53694b0c147834067b90be1508e96f67d290de595516361c98af069ae6cd9113
+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
 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
@@ -10,8 +12,8 @@ EBUILD xf86-video-intel-2.10.0-r1.ebuild 1522 RMD160 fd32aab6eecb6609717907dc996
 EBUILD xf86-video-intel-2.11.0.ebuild 1389 RMD160 4ee8c8ba8c48f37977c9e7f87eb9938ded0ae401 SHA1 57e7d6ddf3837ef88f8442b78cd99ac316a6bcd1 SHA256 ec40c0730c81dfbb60883ac72bce615e80c1759926ddbd30caac05abbf47af1e
 EBUILD xf86-video-intel-2.13.0.ebuild 1363 RMD160 b298e5314ea68e77c783b58d54f58f267700adcc SHA1 bcb900cd6ee75e0af776d38ec0a611e1bfd0d1c5 SHA256 08ab25c6acb246343d73fc830d7352ff6e324ca53aaece2295c930196bf1597b
 EBUILD xf86-video-intel-2.14.0.ebuild 1363 RMD160 79ee67e89f8315e9659db2d04c3b11e5ea428c33 SHA1 0eeb6467fd552adc526f0624f9173faf381c9897 SHA256 2f39c7cb5763dbe2206533bcf7df2dfb22dd70dd0e7c2253ecfdf428381c5c7e
-EBUILD xf86-video-intel-2.15.0.ebuild 1098 RMD160 d0d27b54837e66098b86649a7e6209a8ef288364 SHA1 524cdd72373778969c6ad4d63c5ec04cbff72c63 SHA256 c3b711428296641bf5fa01059f3b2d1d69ad525207d6f0961d1551f397947464
+EBUILD xf86-video-intel-2.15.0-r1.ebuild 1232 RMD160 bfe57dbfed1a192bd2bc02a02f44980914a77d9d SHA1 5b85024cc700886b1327795d1bf9d2ea358a64b3 SHA256 925cb7871208c3726f27ce6c8c246d1503497bdd71bdc8f26efcc2e18796ab5e
 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 41343 RMD160 217a8978c67317f2d168cb7479f05ed75f2d7d32 SHA1 559f16b3cc8bc7f8af8067246609d0324fc6136c SHA256 701a8a839b29b6c9d6ae87cd078e8aec85c1d80a8d865c8bcc024dda2063455a
+MISC ChangeLog 41697 RMD160 bd5ce560d5c3937dce5ced42a71399570c61f982 SHA1 d30c13614a9f427d25c2d72772f70c039bf57b66 SHA256 cd64189e69fccb588eee7279af53763a7b403447a593074b22fd012a297e2f4e
 MISC metadata.xml 157 RMD160 bfca46b367901674b4ec5419c063ae27fb446b0a SHA1 4fe7fb7398abd34822cec8be77f8aaf86e28a1a3 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-batch-overrun.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-batch-overrun.patch
new file mode 100644
index 000000000000..fe2aa2db89b1
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-batch-overrun.patch
@@ -0,0 +1,26 @@
+From c9fb69cb2502917dfb2828c90802de7766072899 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun, 17 Apr 2011 09:42:05 +0000
+Subject: i965/video: We need 150 dwords of space for video state emission
+
+(Actually around 131, with additional 10% just for safety.)
+
+Reported-by: Modestas Vainius <geromanas@mailas.com>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=36319
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/i965_video.c b/src/i965_video.c
+index c757681..53a9394 100644
+--- a/src/i965_video.c
++++ b/src/i965_video.c
+@@ -1210,7 +1210,7 @@ I965DisplayVideoTextured(ScrnInfoPtr scrn,
+ 			intel_batch_submit(scrn);
+ 		}
+ 
+-		intel_batch_start_atomic(scrn, 100);
++		intel_batch_start_atomic(scrn, 150);
+ 
+ 		i965_emit_video_setup(scrn, surface_state_binding_table_bo, n_src_surf, pixmap);
+ 
+--
+cgit v0.8.3-6-g21f6
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-unsigned-promotion.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-unsigned-promotion.patch
new file mode 100644
index 000000000000..d99b669a3f3e
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-unsigned-promotion.patch
@@ -0,0 +1,32 @@
+From a51cd83d25f2f9f2107219d5671194f931601244 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun, 17 Apr 2011 09:36:26 +0000
+Subject: intel: Beware the unsigned promotion when checking for batch overflows
+
+Reported-by: Modestas Vainius <geromanas@mailas.com>
+References: https://bugs.freedesktop.org/show_bug.cgi?id=36319
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/intel_batchbuffer.h b/src/intel_batchbuffer.h
+index 605932a..2403a38 100644
+--- a/src/intel_batchbuffer.h
++++ b/src/intel_batchbuffer.h
+@@ -50,14 +50,14 @@ static inline int intel_vertex_space(intel_screen_private *intel)
+ }
+ 
+ static inline void
+-intel_batch_require_space(ScrnInfoPtr scrn, intel_screen_private *intel, unsigned int sz)
++intel_batch_require_space(ScrnInfoPtr scrn, intel_screen_private *intel, int sz)
+ {
+ 	assert(sz < intel->batch_bo->size - 8);
+ 	if (intel_batch_space(intel) < sz)
+ 		intel_batch_submit(scrn);
+ }
+ 
+-static inline void intel_batch_start_atomic(ScrnInfoPtr scrn, unsigned int sz)
++static inline void intel_batch_start_atomic(ScrnInfoPtr scrn, int sz)
+ {
+ 	intel_screen_private *intel = intel_get_screen_private(scrn);
+ 
+--
+cgit v0.8.3-6-g21f6
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.15.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.15.0-r1.ebuild
index 8e77f76d435e..275f9af9ffda 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.15.0.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.15.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.15.0.ebuild,v 1.1 2011/04/18 09:35:32 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.15.0-r1.ebuild,v 1.1 2011/06/08 09:41:59 chithanh Exp $
 
 EAPI=4
 
@@ -18,6 +18,10 @@ RDEPEND="x11-libs/libXext
 	>=x11-libs/libxcb-1.5"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/xf86-video-intel-2.15-batch-overrun.patch"
+	"${FILESDIR}/xf86-video-intel-2.15-unsigned-promotion.patch"
+)
+
 pkg_setup() {
 	xorg-2_pkg_setup
 	XORG_CONFIGURE_OPTIONS=(