xf86-video-intel: src/uxa/intel_display.c

[Chris Wilson]

 src/uxa/intel_display.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 4497212307dee5e35bc6836201738a2fdb559020
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 18 17:03:40 2013 +0100

    uxa: Do not change DPMS mode on unconnected outputs
    
    The operation is in theory redundant, and in the case of Haswell where
    we have multiple outputs aliasing to the same encoder, actually harmful.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68030
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Tested-by: Stefan Dirsch <sndirsch at suse.de>

diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c
index 7dc0f68..3c2f964 100644
--- a/src/uxa/intel_display.c
+++ b/src/uxa/intel_display.c
@@ -1123,10 +1123,13 @@ intel_output_dpms(xf86OutputPtr output, int dpms)
 				intel_output_dpms_backlight(output,
 							    intel_output->dpms_mode,
 							    dpms);
-			drmModeConnectorSetProperty(mode->fd,
-						    intel_output->output_id,
-						    props->prop_id,
-						    dpms);
+
+			if (output->crtc)
+				drmModeConnectorSetProperty(mode->fd,
+							    intel_output->output_id,
+							    props->prop_id,
+							    dpms);
+
 			if (dpms != DPMSModeOff)
 				intel_output_dpms_backlight(output,
 							    intel_output->dpms_mode,