From af85ffdec7047efa452d6bab3a0ee3889dd4f046 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 15 Jan 2013 20:37:11 +0000
Subject: [PATCH] sna: Avoid serialising on an move-to-cpu for an async
 operation

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/sna/sna_accel.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 0b46218b..a1689253 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1615,6 +1615,8 @@ skip_inplace_map:
 	}
 
 	if (priv->gpu_damage &&
+	    ((flags & MOVE_ASYNC_HINT) == 0 ||
+	     !__kgem_bo_is_busy(&sna->kgem, priv->gpu_bo)) &&
 	    priv->gpu_bo->tiling == I915_TILING_NONE &&
 	    sna_pixmap_move_to_gpu(pixmap, MOVE_READ)) {
 		kgem_bo_submit(&sna->kgem, priv->gpu_bo);