summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2016-10-16 13:31:42 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2016-10-21 11:54:05 +0100
commitf18c7620cfba8412b0d141748fbb195670984ad2 (patch)
tree723a065ee88db003068b010096e89a9d99986df8
parentb9cebe59f9ddc1b38e47514e04a37b6de4efe2df (diff)
sna: Only apply the CRTC fixup when attempting to turn DPMS off
If we were attempting to switch DPMS leave the state as is if the kernel reports an error. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 9d60d9a0..caa238e7 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -4126,7 +4126,7 @@ __sna_output_dpms(xf86OutputPtr output, int dpms, int fixup)
dpms)) {
DBG(("%s(%s:%d): failed to set DPMS to %d (fixup? %d)\n",
__FUNCTION__, output->name, sna_output->id, dpms, fixup));
- if (fixup) {
+ if (fixup && dpms != DPMSModeOn) {
sna_crtc_disable(output->crtc, false);
return;
}