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

[Chris Wilson]

 src/sna/gen6_render.c |    3 ++-
 src/sna/gen7_render.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit eee181e9d71273d94fe735805ed84e8f7b7b2180
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Aug 21 00:19:10 2012 +0100

    sna/gen6+: Only mark the dst as dirty again if it already is in the batch
    
    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 af8899e..257dbc8 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -903,7 +903,8 @@ gen6_emit_state(struct sna *sna,
 	if (kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo)) {
 		gen6_emit_flush(sna);
 		kgem_clear_dirty(&sna->kgem);
-		kgem_bo_mark_dirty(op->dst.bo);
+		if (op->dst.bo->exec)
+			kgem_bo_mark_dirty(op->dst.bo);
 		need_stall = false;
 	}
 	if (need_stall) {
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index d34cdfa..99296fb 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -1047,7 +1047,8 @@ gen7_emit_state(struct sna *sna,
 			need_stall = GEN7_BLEND(op->u.gen7.flags) != NO_BLEND;
 		gen7_emit_pipe_invalidate(sna, need_stall);
 		kgem_clear_dirty(&sna->kgem);
-		kgem_bo_mark_dirty(op->dst.bo);
+		if (op->dst.bo->exec)
+			kgem_bo_mark_dirty(op->dst.bo);
 		need_stall = false;
 	}
 	if (need_stall)