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 <chris@chris-wilson.co.uk>
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 <dbehr@google.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c
index 39d8507..a4e04ec 100644 (file)
--- 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,