From 860e729f0660f84f8ca53f718ac504b92a75d407 Mon Sep 17 00:00:00 2001 From: Chris Bainbridge Date: Mon, 16 May 2016 20:58:35 +0100 Subject: [PATCH] sna: Fix assert_scanout regression Fix regression introduced by 46caee86db0f ("sna: Fix reporting of errno after setcrtc failure") References: https://bugs.freedesktop.org/show_bug.cgi?id=95401 Signed-off-by: Chris Bainbridge --- src/sna/sna_display.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index 867a10b5daca..8cc8a9d96847 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -1447,9 +1447,10 @@ sna_crtc_apply(xf86CrtcPtr crtc) ret = 0; if (unlikely(drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_SETCRTC, &arg))) { ret = errno; - sna_crtc->mode_serial++; - sna_crtc_force_outputs_on(crtc); + goto unblock; } + sna_crtc->mode_serial++; + sna_crtc_force_outputs_on(crtc); unblock: kmsg_close(&kmsg, ret); sigio_unblock(sigio); -- 2.1.4