From aa89ef69ac413abc65268a3758979b0edd1f3000 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 5 Oct 2014 09:20:12 +0100
Subject: [PATCH] sna: Double check for no residual CPU damage along redisplay
 fast path

If we are using a CRTC source pixmap, it is possible that it is on the
CPU with a GPU bo and so requires flushing prior to the copy.

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

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 72c6ef53..e41674be 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -6801,6 +6801,7 @@ sna_crtc_redisplay(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo *bo)
 
 	if (crtc->filter == NULL &&
 	    priv->gpu_bo &&
+	    priv->cpu_damage == NULL &&
 	    sna_transform_is_integer_translation(&crtc->crtc_to_framebuffer,
 						 &tx, &ty)) {
 		DrawableRec tmp;