From e07c38649280b3f4361005bc4c256f2145a72537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Tue, 10 Jul 2018 18:48:16 +0200 Subject: Update RandR CRTC state if set_mode_major fails in set_desired_modes Without this, RandR would report the CRTC and its outputs as enabled, even though they were actually off due to the failure. (Cherry picked from amdgpu commit 4dcda0b48d62944c841cd9540f4ad4c7ac8dee47) Acked-by: Alex Deucher --- src/drmmode_display.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 64dab316..fa05cda4 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -2833,6 +2833,8 @@ Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode, } else { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Failed to set mode on CRTC %d\n", c); + RRCrtcSet(crtc->randr_crtc, NULL, crtc->x, crtc->y, + crtc->rotation, 0, NULL); } } else { crtc->mode = crtc->desiredMode; -- cgit v1.2.3