xf86-video-intel: 2 commits - src/i965_video.c src/intel_batchbuffer.h
Chris Wilson
ickle at kemper.freedesktop.org
Sun Apr 17 02:44:10 PDT 2011
src/i965_video.c | 2 +-
src/intel_batchbuffer.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c9fb69cb2502917dfb2828c90802de7766072899
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Apr 17 10:42:05 2011 +0100
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 at mailas.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=36319
Signed-off-by: Chris Wilson <chris at 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);
commit a51cd83d25f2f9f2107219d5671194f931601244
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Apr 17 10:36:26 2011 +0100
intel: Beware the unsigned promotion when checking for batch overflows
Reported-by: Modestas Vainius <geromanas at mailas.com>
References: https://bugs.freedesktop.org/show_bug.cgi?id=36319
Signed-off-by: Chris Wilson <chris at 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);
More information about the xorg-commit
mailing list