summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2005-10-03 09:39:17 +0000
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2005-10-03 09:39:17 +0000
commit6fda4e886c30669e346f7f30a38b93a77004a7f6 (patch)
treefa51b5a05cd4f0c626e6ad18056cd44e330c0ff7
parent154724cc4be1e951649c29e4abdbde964a8c112e (diff)
Bug #4353: Fix lockup when suspend and resume when playing video.XORG-6_8_99_901
Shutdown the overlay on LeaveVT.
-rw-r--r--src/i830_driver.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index e5d0bb1e..b281affd 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -4967,6 +4967,11 @@ I830BIOSLeaveVT(int scrnIndex, int flags)
TimerCancel(pI830->devicesTimer);
pI830->devicesTimer = NULL;
+#ifdef I830_XV
+ /* Give the video overlay code a chance to shutdown. */
+ I830VideoSwitchModeBefore(pScrn, NULL);
+#endif
+
if (pI830->Clone) {
/* Ensure we don't try and setup modes on a clone head */
pI830->CloneHDisplay = 0;