[gentoo-commits] gentoo-x86 commit in x11-drivers/xf86-video-intel/files: xf86-video-intel-2.15-unsigned-promotion.patch xf86-video-intel-2.15-batch-overrun.patch

[gentoo-commits] gentoo-x86 commit in x11-drivers/xf86-video-intel/files: xf86-video-intel-2.15-unsigned-promotion.patch xf86-video-intel-2.15-batch-overrun.patch

[Chi-Thanh Christopher Nguyen (chithanh)]

chithanh    11/06/08 09:41:59

  Added:                xf86-video-intel-2.15-unsigned-promotion.patch
                        xf86-video-intel-2.15-batch-overrun.patch
  Log:
  Add patches to fix segfault, bug #366091, upstream #36319.
  
  (Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-unsigned-promotion.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-unsigned-promotion.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-unsigned-promotion.patch?rev=1.1&content-type=text/plain

Index: xf86-video-intel-2.15-unsigned-promotion.patch
===================================================================
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



1.1                  x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-batch-overrun.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-batch-overrun.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-batch-overrun.patch?rev=1.1&content-type=text/plain

Index: xf86-video-intel-2.15-batch-overrun.patch
===================================================================
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