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 <alexander.deucher@amd.com>
This commit is contained in:
Michel Dänzer
2018-07-10 18:48:16 +02:00
committed by Michel Dänzer
parent 05390ae36a
commit e07c386492

View File

@@ -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;