xf86-video-amdgpu: Branch 'master'
Michel Dänzer
daenzer at kemper.freedesktop.org
Wed Jul 8 23:22:18 PDT 2015
src/drmmode_display.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5587a7b43d02d6371ed4675a6260427492ebad94
Author: Piotr Redlewski <predlewski at gmail.com>
Date: Wed Jul 8 20:59:14 2015 +0200
Do not try to enable already enabled CRTCs in DPMS hook
(Ported from radeon commit a8ed62010d5012dfb27773595c446b217f3c00c5)
Signed-off-by: Piotr Redlewski <predlewski at gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 0f23296..7e0af1a 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -307,7 +307,7 @@ drmmode_crtc_dpms(xf86CrtcPtr crtc, int mode)
if (!crtc->enabled || mode != DPMSModeOn)
drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
0, 0, 0, NULL, 0, NULL);
- else
+ else if (drmmode_crtc->dpms_mode != DPMSModeOn)
crtc->funcs->set_mode_major(crtc, &crtc->mode, crtc->rotation,
crtc->x, crtc->y);
}
More information about the xorg-commit
mailing list