[devel-remove_vgaHWInit]

- My modesetting doesn't depend on vgaHW initialised hwp->ModeRegs. It does
    everything from scratch itself. Remove vgaHWInit from WriteMode.
- This removes our single point of failure within WriteMode, which was a
    vgaHWInit call to vgaHWGetHWRec, which I already did in PreInit. So
    WriteMode becomes a static void.
- This cleans up return handling in EnterVT, ScreenInit and SwitchMode.
- Remove leftover debug entry in pVia (for dumping rom).

2 files changed, 9 insertions, 19 deletions

diff --git a/src/via_driver.c b/src/via_driver.c
index 862af14..011828b 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -63,7 +63,7 @@ static Bool VIAEnterVT(int scrnIndex, int flags);
 static void VIALeaveVT(int scrnIndex, int flags);
 static void VIASave(ScrnInfoPtr pScrn);
 static void VIARestore(ScrnInfoPtr pScrn);
-static Bool VIAWriteMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
+static void VIAWriteMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
 static Bool VIACloseScreen(int scrnIndex, ScreenPtr pScreen);
 static Bool VIASaveScreen(ScreenPtr pScreen, int mode);
 static Bool VIAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
@@ -1561,18 +1561,18 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags)
 }
 
 
-static Bool VIAEnterVT(int scrnIndex, int flags)
+static Bool
+VIAEnterVT(int scrnIndex, int flags)
 {
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     VIAPtr      pVia = VIAPTR(pScrn);
     vgaHWPtr hwp = VGAHWPTR(pScrn);
-    Bool        ret;
 
     /* FIXME: Rebind AGP memory here */
     VIAFUNC(scrnIndex);
     
     VIASave(pScrn);
-    ret = VIAWriteMode(pScrn, pScrn->currentMode);
+    VIAWriteMode(pScrn, pScrn->currentMode);
 
     vgaHWUnlock(hwp);
 
@@ -1587,7 +1587,7 @@ static Bool VIAEnterVT(int scrnIndex, int flags)
     }
 #endif 
 
-    return ret;
+    return TRUE;
 }
 
 
@@ -2036,10 +2036,7 @@ VIAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 
     vgaHWBlankScreen(pScrn, FALSE);
 
-    if (!VIAWriteMode(pScrn, pScrn->currentMode)) {
-        vgaHWBlankScreen(pScrn, TRUE);
-        return FALSE;
-    }
+    VIAWriteMode(pScrn, pScrn->currentMode);
 
     pVia->FirstInit = FALSE;
 
@@ -2260,7 +2257,7 @@ VIAInternalScreenInit(ScrnInfoPtr pScrn, ScreenPtr pScreen)
 #endif
 }
 
-static Bool 
+static void
 VIAWriteMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
     VIAPtr pVia = VIAPTR(pScrn);
@@ -2272,9 +2269,6 @@ VIAWriteMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
     pVia->Swov->Allowed = FALSE;
 #endif
 
-    if (!vgaHWInit(pScrn, mode))
-        return FALSE;
-
     pScrn->vtSema = TRUE;
 
     /* FIXME - need DRI lock for this bit - see i810 */
@@ -2292,7 +2286,6 @@ VIAWriteMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
 #endif 
 
     VIAAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
-    return TRUE;
 }
 
 
@@ -2416,7 +2409,6 @@ VIASwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
 {
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     VIAPtr      pVia = VIAPTR(pScrn);
-    Bool        ret;
     
     VIAFUNC(scrnIndex);
     
@@ -2435,7 +2427,7 @@ VIASwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
     if (pVia->VQEnable)
 	ViaVQDisable(pScrn);
     
-    ret = VIAWriteMode(pScrn, mode);
+    VIAWriteMode(pScrn, mode);
 
 #ifdef XF86DRI
     if (pVia->directRenderingEnabled) {
@@ -2443,8 +2435,7 @@ VIASwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
 	DRIUnlock(screenInfo.screens[scrnIndex]);
     }
 #endif 
-    return ret;
-    
+    return TRUE;
 }
 
 
diff --git a/src/via_driver.h b/src/via_driver.h
index e25566f..f7c5ccf 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -250,7 +250,6 @@ typedef struct _VIA {
     ViaSharedPtr	sharedData;
 
 #ifdef HAVE_DEBUG
-    Bool  DumpVGAROM;
     Bool  PrintVGARegs;
     Bool  PrintTVRegs;
     Bool  PrintSwovRegs;