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

[Chris Wilson]

 src/sna/sna_display.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 2046a49be59866a16db776ba53a588dbf6c02b12
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jun 21 15:43:32 2014 +0100

    sna: Clear the transform flag on disabling the CRTC
    
    In places, we assume that if the flag is set, we must have an active
    CRTC. However, we were not clearing when disabling the CRTC.
    
    Reported-by: Sree Harsha Totakura <freedesktop at h.totakura.in>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80325
    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 bc35a67..305bccf 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1410,7 +1410,10 @@ sna_crtc_disable(xf86CrtcPtr crtc)
 		sna->mode.dirty = true;
 	}
 
+	sna_crtc->transform = false;
+
 	assert(sna_crtc->dpms_mode == DPMSModeOff);
+	assert(!sna_crtc->shadow);
 }
 
 static void update_flush_interval(struct sna *sna)
@@ -6213,6 +6216,7 @@ void sna_mode_redisplay(struct sna *sna)
 			continue;
 
 		assert(crtc->enabled);
+		assert(sna_crtc->bo);
 
 		damage.extents = crtc->bounds;
 		damage.data = NULL;