xf86-video-intel: src/i830_accel.c src/i830_batchbuffer.c

[Chris Wilson]

 src/i830_accel.c       |    5 ++++-
 src/i830_batchbuffer.c |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit a8ea20100de5be45699e71eb6ba67bef546ad0cd
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Nov 30 10:13:18 2009 +0000

    debug: Don't always flush the batch when emitting a debugging flush
    
    I incorrectly changed the logic in 285f286 and caused the batch to
    always be flushed when debugging, instead of merely inserting a MI_FLUSH
    between operations.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/i830_accel.c b/src/i830_accel.c
index 83fdf8a..2622837 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -71,7 +71,10 @@ void i830_debug_flush(ScrnInfoPtr scrn)
 {
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-	if (intel->debug_flush & (DEBUG_FLUSH_BATCHES | DEBUG_FLUSH_CACHES))
+	if (intel->debug_flush & DEBUG_FLUSH_CACHES)
+		intel_batch_pipelined_flush(scrn);
+
+	if (intel->debug_flush & DEBUG_FLUSH_BATCHES)
 		intel_batch_flush(scrn, FALSE);
 }
 
diff --git a/src/i830_batchbuffer.c b/src/i830_batchbuffer.c
index 351c0c8..6a4ece2 100644
--- a/src/i830_batchbuffer.c
+++ b/src/i830_batchbuffer.c
@@ -128,7 +128,7 @@ void intel_batch_flush(ScrnInfoPtr scrn, Bool flush)
 
 	assert (!intel->in_batch_atomic);
 
-	if (flush || intel->debug_flush & DEBUG_FLUSH_CACHES) {
+	if (flush) {
 		int flags = MI_WRITE_DIRTY_STATE | MI_INVALIDATE_MAP_CACHE;
 
 		if (IS_I965G(intel))