sna: Always treat DPMSModeSuspend/Standby similar to DPMSModeOff

As we assume that Suspend, Standby alias to Off and disable the crtc
when switching to any mode other than On, we need to also perform the
backlight updates for Suspend,Standby prior to passing the DPMS value
onto the kernel.

Suggested-by: Alexander Monakov <amonakov@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 5810dd1..4818cfc 100644 (file)
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2293,7 +2293,7 @@ sna_output_dpms(xf86OutputPtr output, int dpms)
         * record the value before the kernel modifies it
         * and reapply it afterwards.
         */
-       if (dpms == DPMSModeOff)
+       if (dpms != DPMSModeOn)
                sna_output_dpms_backlight(output,
                                          sna_output->dpms_mode,
                                          dpms);
@@ -2304,7 +2304,7 @@ sna_output_dpms(xf86OutputPtr output, int dpms)
                                            sna_output->dpms_id,
                                            dpms);
 
-       if (dpms != DPMSModeOff)
+       if (dpms == DPMSModeOn)
                sna_output_dpms_backlight(output,
                                          sna_output->dpms_mode,
                                          dpms);