Map FB during screen initialization rather than pre-initialization

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

2 files changed, 8 insertions, 6 deletions

diff --git a/src/via_driver.c b/src/via_driver.c
index e1a6b6e..6920f67 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1216,7 +1216,6 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
     goto exit;
 fail:
     if (!pVia->KMS) {
-        viaUnmapFB(pScrn);
         viaUnmapMMIO(pScrn);
     }
 
diff --git a/src/via_ums.c b/src/via_ums.c
index 042979a..f1c19ef 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -806,6 +806,14 @@ viaUMSCreate(ScrnInfoPtr pScrn)
     }
 #endif
 
+    /*
+     * Map FB PCI hardware resource to the memory map.
+     */
+    if (!viaMapFB(pScrn)) {
+        ret = FALSE;
+        goto exit;
+    }
+
     if (pVia->directRenderingType == DRI_NONE) {
         if (!pVia->useEXA) {
             if (!viaInitFB(pScrn)) {
@@ -1142,11 +1150,6 @@ viaUMSPreInit(ScrnInfoPtr pScrn)
         return FALSE;
     }
 
-    if (!viaMapFB(pScrn)) {
-        viaUnmapMMIO(pScrn);
-        return FALSE;
-    }
-
     return TRUE;
 }