summaryrefslogtreecommitdiff
path: root/src/drmmode_display.c
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2012-06-06 12:16:08 +0200
committerMichel Dänzer <michel@daenzer.net>2012-06-06 12:16:08 +0200
commit1d9f1eb7e65c57c52759ccbfa51e8bdd5a10acac (patch)
treec33bb9ec3ce42b2673ce873c15cfd43d83b5e3aa /src/drmmode_display.c
parent4603285aa8efaf2614f15a38254465cec2075f11 (diff)
Don't wait on a CRTC which has been disabled via DPMS (bug #49761).
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=49761 . Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'src/drmmode_display.c')
-rw-r--r--src/drmmode_display.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index fad13db9..3a08d8a2 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -179,11 +179,12 @@ drmmode_ConvertToKMode(ScrnInfoPtr scrn,
static void
drmmode_crtc_dpms(xf86CrtcPtr crtc, int mode)
{
-#if 0
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
-// drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
// drmmode_ptr drmmode = drmmode_crtc->drmmode;
+ drmmode_crtc->dpms_mode = mode;
+
+#if 0
/* bonghits in the randr 1.2 - uses dpms to disable crtc - bad buzz */
if (mode == DPMSModeOff) {
// drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,