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

[Chris Wilson]

 src/sna/gen7_render.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0d93b0ef343a635512c3835c797c469c17a7b584
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Nov 1 12:49:36 2013 +0000

    sna/gen7: Undo overzealous flushing
    
    commit d580a30aaf97687f9669ea72fbc3310c2fea26f1
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Thu Oct 31 15:58:47 2013 +0000
    
        sna/gen7: Flush render cache when changing CC state
    
    ultimately doesn't prevent the issue and in the process adversely
    affects perforamnce.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 6261f65..4093c02 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -1110,7 +1110,7 @@ gen7_emit_state(struct sna *sna,
 		need_invalidate = true;
 
 	need_flush =
-		sna->render_state.gen7.emit_flush ||
+		sna->render_state.gen7.emit_flush &&
 		wm_binding_table & GEN7_READS_DST(op->u.gen7.flags);
 	if (ALWAYS_FLUSH)
 		need_flush = true;