[PATCH xf86-video-ati 06/21] Update RandR CRTC state if set_mode_major fails in set_desired_modes

[michel@xxxxxxxxxxx (Michel Dänzer)]

From: Michel Dänzer <michel.daenzer@xxxxxxx>

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)

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---
 src/drmmode_display.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 64dab316f..fa05cda48 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;
-- 
2.18.0