From b881d1b16a8beec024ac18eca8308418e34cb05d Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 12 Jun 2011 20:13:26 +0100
Subject: [PATCH] sna: Check that the scanout is still attached before waiting
 for scanline

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

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index bf0b98ff..e893a370 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1877,9 +1877,11 @@ sna_wait_for_scanline(struct sna *sna,
 
 	if (crtc == NULL) {
 		crtc = sna_covering_crtc(sna->scrn, clip, NULL, &crtc_box);
-		assert(crtc);
+		if (crtc == NULL)
+			return false;
 	} else
 		sna_crtc_box(crtc, &crtc_box);
+	assert(sna_crtc_on(crtc));
 
 	if (crtc->transform_in_use) {
 		box = *clip;