summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-06-12 20:13:26 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2011-06-12 20:13:26 +0100
commitb881d1b16a8beec024ac18eca8308418e34cb05d (patch)
treef70cb7e05915566049acc91ca06f2030445b8ca6
parentbb08e73c557c379ef131225ffea5aa729ca781d6 (diff)
sna: Check that the scanout is still attached before waiting for scanline
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_display.c4
1 files changed, 3 insertions, 1 deletions
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;