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

[Chris Wilson]

 src/sna/sna_display.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 34f63f28c8f39e1d64cd159482f86cacbbff05b4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon May 16 10:14:04 2016 +0100

    sna: Ensure we only cache the local CRTC scanout buffer
    
    Double check that we are not about to cache the common, untransformed,
    shadow buffer for the per-CRTC transformed buffer.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 080efbe..867a10b 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -8777,9 +8777,11 @@ disable1:
 				sna_crtc->flip_serial = sna_crtc->mode_serial;
 				sna_crtc->flip_pending = true;
 
-				assert_scanout(&sna->kgem, sna_crtc->bo,
-					       crtc->mode.HDisplay, crtc->mode.VDisplay);
-				sna_crtc->cache_bo = kgem_bo_reference(sna_crtc->bo);
+				if (sna_crtc->bo != sna->mode.shadow) {
+					assert_scanout(&sna->kgem, sna_crtc->bo,
+						       crtc->mode.HDisplay, crtc->mode.VDisplay);
+					sna_crtc->cache_bo = kgem_bo_reference(sna_crtc->bo);
+				}
 				DBG(("%s: recording flip on CRTC:%d handle=%d, active_scanout=%d, serial=%d\n",
 				     __FUNCTION__, __sna_crtc_id(sna_crtc), sna_crtc->flip_bo->handle, sna_crtc->flip_bo->active_scanout, sna_crtc->flip_serial));
 			} else {