From 72e909953c1865f86fbd6325ff807d7c7357af5f Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 13 Feb 2014 09:46:13 +0000 Subject: [PATCH] Revert "uxa: Do not change DPMS mode on unconnected outputs" This reverts commit 4497212307dee5e35bc6836201738a2fdb559020. Unfortunately, this simple fix does not work for UXA as DPMS is used by the xserver to turn off CRTCs and outputs. Since UXA does not implement CRTC DPMS, this commit causes us to fail to turn off outputs. The kernel has been fixed up in the meantime and that commit has been recommended to be backported to all stable kernels: commit c9976dcf55c8aaa7037427b239f15e5acfc01a3a Author: Chris Wilson Date: Sun Sep 29 19:15:07 2013 +0100 drm/i915: Only apply DPMS to the encoder if enabled so it should be safe for UXA to rely on its old behaviour. Bugzilla: https://code.google.com/p/chromium/issues/detail?id=341135 References: https://bugs.freedesktop.org/show_bug.cgi?id=68030 Suggested-by: Dominik Behr Signed-off-by: Chris Wilson --- src/uxa/intel_display.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c index 39d85071..a4e04ec4 100644 --- a/src/uxa/intel_display.c +++ b/src/uxa/intel_display.c @@ -1123,11 +1123,10 @@ intel_output_dpms(xf86OutputPtr output, int dpms) intel_output->dpms_mode, dpms); - if (output->crtc) - drmModeConnectorSetProperty(mode->fd, - intel_output->output_id, - props->prop_id, - dpms); + drmModeConnectorSetProperty(mode->fd, + intel_output->output_id, + props->prop_id, + dpms); if (dpms == DPMSModeOn) intel_output_dpms_backlight(output,