xf86-video-intel: src/sna/sna_display.c

[Chris Wilson]

 src/sna/sna_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f18c7620cfba8412b0d141748fbb195670984ad2
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Oct 16 13:31:42 2016 +0100

    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 at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 9d60d9a..caa238e 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;
 		}