xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/modes/xf86RandR12.c |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit cca4bc342cacdbd1ce819c08af2f4795f6a704c3
Author: Andres Rodriguez <andresx7 at gmail.com>
Date:   Fri Sep 6 18:32:44 2019 -0400

    xf86: Disable unused crtc functions when a lease is revoked
    
    This fixes 'non-desktop' displays staying powered on after their lease
    has been revoked.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111620
    Cc: Keith Packard <keithp at keithp.com>
    Signed-off-by: Andres Rodriguez <andresx7 at gmail.com>

diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index b476c07ce..adec7bd3c 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -2210,6 +2210,7 @@ xf86CrtcLeaseTerminated(RRLeasePtr lease)
 {
     int c;
     int o;
+    ScrnInfoPtr scrn = xf86ScreenToScrn(lease->screen);
 
     RRLeaseTerminated(lease);
     /*
@@ -2240,6 +2241,10 @@ xf86CrtcLeaseTerminated(RRLeasePtr lease)
             xf86CrtcCheckReset(crtc);
         }
     }
+
+    /* Power off if necessary */
+    xf86DisableUnusedFunctions(scrn);
+
     RRLeaseFree(lease);
 }