From: Stéphane Marchesin <marcheu@chromium.org>
Date: Thu, 19 Jan 2012 03:24:18 +0000 (-0800)
Subject: i915g: Don't avoid flushing when we have a pending fence.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=32b07bb1496f5772ca16e719bb87e1702ceff196;p=mesa.git

i915g: Don't avoid flushing when we have a pending fence.

Otherwise the fence will never arrive.
Also check for a NULL i915->batch.

NOTE: This is a candidate for the 8.0 branch.
---

diff --git a/src/gallium/drivers/i915/i915_flush.c b/src/gallium/drivers/i915/i915_flush.c
index 5d8e3c8274f..0a0ca7885da 100644
--- a/src/gallium/drivers/i915/i915_flush.c
+++ b/src/gallium/drivers/i915/i915_flush.c
@@ -45,7 +45,10 @@ static void i915_flush_pipe( struct pipe_context *pipe,
 
    draw_flush(i915->draw);
 
-   if (i915->batch->map == i915->batch->ptr) {
+   /* Only shortcut this if we have no fence, otherwise we must flush the
+    * empty batchbuffer to get our fence back.
+    */
+   if (!fence && i915->batch && (i915->batch->map == i915->batch->ptr)) {
       return;
    }