xf86-video-intel: src/sna/gen6_render.c

[Chris Wilson]

 src/sna/gen6_render.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 37d8566ee78c67647b159a96ddb2675d1506b967
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Feb 9 12:28:27 2014 +0000

    sna/gen6: Restore stall dropped when not flushing instead
    
    commit 82e6d41c2f4f343bd1854d3d8ee4b624b5d68971
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Thu Oct 31 13:35:59 2013 +0000
    
        sna/gen6: Tweak flush around CC state changes
    
    Replaced the pipeline stall with a flush - but only when the target was
    dirty. The missing stall however seems to be required as well.
    
    v2: Actually emit the stall for all CC state changes [Ilia Mirkin]
    
    Reported-by: Ilia Mirkin <imirkin at alum.mit.edu>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72375
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index aadc6f7..f36bf79 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -870,15 +870,16 @@ gen6_emit_state(struct sna *sna,
 
 	assert(op->dst.bo->exec);
 
-	need_flush =
-		gen6_emit_cc(sna, GEN6_BLEND(op->u.gen6.flags)) &&
-		wm_binding_table & 1;
+	need_stall = wm_binding_table & 1;
+	need_flush = false;
+	if (gen6_emit_cc(sna, GEN6_BLEND(op->u.gen6.flags)))
+		need_flush = need_stall;
 	gen6_emit_sampler(sna, GEN6_SAMPLER(op->u.gen6.flags));
 	gen6_emit_sf(sna, GEN6_VERTEX(op->u.gen6.flags) >> 2);
 	gen6_emit_wm(sna, GEN6_KERNEL(op->u.gen6.flags), GEN6_VERTEX(op->u.gen6.flags) >> 2);
 	gen6_emit_vertex_elements(sna, op);
 
-	need_stall = gen6_emit_binding_table(sna, wm_binding_table & ~1);
+	need_stall |= gen6_emit_binding_table(sna, wm_binding_table & ~1);
 	if (gen6_emit_drawing_rectangle(sna, op))
 		need_stall = false;
 	if (need_flush || kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo)) {