diff --git a/src/i830_accel.c b/src/i830_accel.c
index 83fdf8a7..26228376 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 351c0c86..6a4ece2d 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))