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

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

4 files changed, 72 insertions, 2 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/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=(