1 files changed, 8 insertions, 5 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c
index caab501c8..2e55a7849 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c
@@ -1900,12 +1900,15 @@ I810CloseScreen(int scrnIndex, ScreenPtr pScreen)
    I810Ptr pI810 = I810PTR(pScrn);
    XAAInfoRecPtr infoPtr = pI810->AccelInfoRec;
 
-   
+   if (pScrn->vtSema == TRUE) {
+       I810Restore(pScrn);
+       vgaHWLock(hwp);
+   }
 #ifdef XF86DRI
-    if (pI810->directRenderingEnabled) {
-	I810DRICloseScreen(pScreen);
-	pI810->directRenderingEnabled=FALSE;
-    }
+   if (pI810->directRenderingEnabled) {
+       I810DRICloseScreen(pScreen);
+       pI810->directRenderingEnabled=FALSE;
+   }
 #endif
 
    if(pScrn->vtSema == TRUE) {