xf86-video-ati: Branch 'master'
Michel Dänzer
daenzer at kemper.freedesktop.org
Thu Apr 30 18:20:42 PDT 2015
src/drmmode_display.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 1584dc545c78e0bce8d4b4b9f26b568e2c211453
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Tue Apr 28 17:14:11 2015 +0900
Skip disabled CRTCs in drmmode_set_desired_modes() even if set_hw == FALSE
Not skipping a disabled CRTC results in a crash.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90187
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 06d1ec0..c12bf51 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -2145,10 +2145,13 @@ Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode,
int o;
/* Skip disabled CRTCs */
- if (set_hw && !crtc->enabled) {
- drmmode_do_crtc_dpms(crtc, DPMSModeOff);
- drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
- 0, 0, 0, NULL, 0, NULL);
+ if (!crtc->enabled) {
+ if (set_hw) {
+ drmmode_do_crtc_dpms(crtc, DPMSModeOff);
+ drmModeSetCrtc(drmmode->fd,
+ drmmode_crtc->mode_crtc->crtc_id,
+ 0, 0, 0, NULL, 0, NULL);
+ }
continue;
}
More information about the xorg-commit
mailing list