summaryrefslogtreecommitdiff
path: root/hw/xfree86/common/xf86DGA.c
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86/common/xf86DGA.c')
-rw-r--r--hw/xfree86/common/xf86DGA.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index de805c4c0..fa70ba2f0 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -268,7 +268,7 @@ DGACloseScreen(ScreenPtr pScreen)
DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
mieqSetHandler(ET_DGAEvent, NULL);
-
+ pScreenPriv->pScrn->SetDGAMode(pScreenPriv->pScrn, 0, NULL);
FreeMarkedVisuals(pScreen);
pScreen->CloseScreen = pScreenPriv->CloseScreen;
@@ -276,9 +276,6 @@ DGACloseScreen(ScreenPtr pScreen)
pScreen->InstallColormap = pScreenPriv->InstallColormap;
pScreen->UninstallColormap = pScreenPriv->UninstallColormap;
- /* DGAShutdown() should have ensured that no DGA
- screen were active by here */
-
free(pScreenPriv);
return ((*pScreen->CloseScreen) (pScreen));
@@ -576,24 +573,6 @@ DGAActive(int index)
return FALSE;
}
-/* Called by the event code in case the server is abruptly terminated */
-
-void
-DGAShutdown(void)
-{
- ScrnInfoPtr pScrn;
- int i;
-
- if (!DGAScreenKeyRegistered)
- return;
-
- for (i = 0; i < screenInfo.numScreens; i++) {
- pScrn = xf86Screens[i];
-
- (void) (*pScrn->SetDGAMode) (pScrn, 0, NULL);
- }
-}
-
/* Called by the extension to initialize a mode */
static int