Unmap MMIO and FB when tearing down the DDX

Signed-off-by: Kevin Brace <kevinbrace@gmx.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/src/via_driver.c b/src/via_driver.c
index 4733c04..152e9b6 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -396,6 +396,7 @@ static void
 VIAFreeScreen(FREE_SCREEN_ARGS_DECL)
 {
     SCRN_INFO_PTR(arg);
+    VIAPtr pVia = VIAPTR(pScrn);
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIAFreeScreen\n"));
 
@@ -403,6 +404,10 @@ VIAFreeScreen(FREE_SCREEN_ARGS_DECL)
         vgaHWFreeHWRec(pScrn);
     }
 
+    if (!pVia->KMS) {
+        viaUnmapMMIO(pScrn);
+    }
+
     VIAFreeRec(pScrn);
 }
 
@@ -1397,6 +1402,10 @@ VIACloseScreen(CLOSE_SCREEN_ARGS_DECL)
     }
 #endif
 
+    if (!pVia->KMS) {
+        viaUnmapMMIO(pScrn);
+    }
+
     pScrn->vtSema = FALSE;
     pScreen->CloseScreen = pVia->CloseScreen;
     return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS);