summaryrefslogtreecommitdiff
path: root/src/i830_render.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2009-12-07 11:09:14 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2009-12-07 11:15:42 +0000
commitcd475bad23c02130d11c49882c11261c9f0d4ef1 (patch)
tree0f63ed78534c7251597cd3cd496bae881f77b186 /src/i830_render.c
parent415aab474edd1425034981306718afd8506445f1 (diff)
batch: Ensure we send a MI_FLUSH in the block handler for TFP
This should restore the previous level of synchronisation between textures and pixmaps, but *does not* guarantee that a texture will be flushed before use. tfp should be fixed so that the ddx can submit the batch if required to flush the pixmap. A side-effect of this patch is to rename intel_batch_flush() to intel_batch_submit() to reduce the confusion of executing a batch buffer with that of emitting a MI_FLUSH. Should fix the remaining rendering corruption involving tfp [inc compiz]: Bug 25431 [i915 bisected] piglit/texturing_tfp regressed http://bugs.freedesktop.org/show_bug.cgi?id=25431 Bug 25481 Wrong cursor format and cursor blink rate with compiz enabled http://bugs.freedesktop.org/show_bug.cgi?id=25481 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/i830_render.c')
-rw-r--r--src/i830_render.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i830_render.c b/src/i830_render.c
index fd8003f0..4d37a404 100644
--- a/src/i830_render.c
+++ b/src/i830_render.c
@@ -555,7 +555,7 @@ i830_prepare_composite(int op, PicturePtr source_picture,
if(i830_uxa_pixmap_is_dirty(source) ||
(mask && i830_uxa_pixmap_is_dirty(mask)))
- intel_batch_pipelined_flush(scrn);
+ intel_batch_emit_flush(scrn);
intel->needs_render_state_emit = TRUE;