diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-09-18 17:03:40 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-09-20 11:45:47 +0100 |
| commit | 4497212307dee5e35bc6836201738a2fdb559020 (patch) | |
| tree | 82d51dad82151a037685df7a384a8f6fb3ea9a27 /src/uxa | |
| parent | 63a070a31a3963f836539ee7629d64fe3c9f88c8 (diff) | |
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@chris-wilson.co.uk>
Tested-by: Stefan Dirsch <sndirsch@suse.de>
Diffstat (limited to 'src/uxa')
| -rw-r--r-- | src/uxa/intel_display.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c index 7dc0f68e..3c2f9643 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, |