xserver: Branch 'server-1.20-branch'
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Sep 23 18:16:42 UTC 2019
hw/xfree86/modes/xf86RandR12.c | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 5aadaac9499c71ebf88c0e5fc658d9d56c8a7e16
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 34f2652bf..f220ef192 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -2226,6 +2226,7 @@ xf86CrtcLeaseTerminated(RRLeasePtr lease)
{
int c;
int o;
+ ScrnInfoPtr scrn = xf86ScreenToScrn(lease->screen);
RRLeaseTerminated(lease);
/*
@@ -2256,6 +2257,10 @@ xf86CrtcLeaseTerminated(RRLeasePtr lease)
xf86CrtcCheckReset(crtc);
}
}
+
+ /* Power off if necessary */
+ xf86DisableUnusedFunctions(scrn);
+
RRLeaseFree(lease);
}
More information about the xorg-commit
mailing list