[devel-pBIOSInfo_remove_pScrn_entries]

- remove entries from pBIOSInfo which are present in ScrnInfoPtr: hwp,
    bitsPerPixel, displayWidth.
- Remove unused functions which depend on those entries
- Move xf86DrvMsg to pScrn->scrnIndex where pScrn is available.
- Group/Reshuffle entries in pBIOSInfo

1 files changed, 18 insertions, 28 deletions

diff --git a/src/via_driver.c b/src/via_driver.c
index 2c1c10b..2b1c7e7 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -412,7 +412,6 @@ static Bool VIAGetRec(ScrnInfoPtr pScrn)
         xnfcalloc(sizeof(VIABIOSInfoRec), 1);
     ((VIARec *)(pScrn->driverPrivate))->pBIOSInfo->pModeTable =
         xnfcalloc(sizeof(VIAModeTableRec), 1);
-    ((VIARec *)(pScrn->driverPrivate))->pBIOSInfo->hwp = VGAHWPTR(pScrn);
 
     /* initial value in VIARec */
     ((VIARec *)(pScrn->driverPrivate))->SavedReg.mode = 0xFF;
@@ -1440,9 +1439,9 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags)
         pBIOSInfo->TVEncoder = VIACheckTVExist(pBIOSInfo);
     }
     /* Detect TMDS/LVDS Encoder */
-    VIAPostDVI(pBIOSInfo);
-    /*VIAGetPanelInfo(pBIOSInfo);*/
-    pBIOSInfo->ConnectedDevice = VIAGetDeviceDetect(pBIOSInfo);
+    VIAPostDVI(pScrn);
+    /*VIAGetPanelInfo(pScrn);*/
+    pBIOSInfo->ConnectedDevice = VIAGetDeviceDetect(pScrn);
 
     xf86SetCrtcForModes(pScrn, INTERLACE_HALVE_V);
     pScrn->currentMode = pScrn->modes;
@@ -1879,9 +1878,9 @@ static void VIAWriteMode(ScrnInfoPtr pScrn, vgaRegPtr vgaSavePtr,
         hwp->writeCrtc(hwp, i + 0x50, restore->CRTCRegs[i]);
 
     if (pBIOSInfo->DefaultActiveDevice & VIA_DEVICE_LCD)
-        VIAEnableLCD(pBIOSInfo);
+	VIAEnableLCD(pScrn);
 
-    ViaDisablePrimaryFIFO(pBIOSInfo);
+    ViaDisablePrimaryFIFO(pScrn);
     /* Reset clock */
     tmp = hwp->readMiscOut(hwp);
     hwp->writeMiscOut(hwp, tmp);
@@ -2513,17 +2512,14 @@ static ModeStatus VIAValidMode(int scrnIndex, DisplayModePtr mode,
 }
 
 
-static void VIABIOSInit(VIAPtr pVia, ScrnInfoPtr pScrn, DisplayModePtr pMode)
+static void VIABIOSInit(ScrnInfoPtr pScrn, DisplayModePtr pMode)
 {
-    int             i;
+    VIAPtr pVia = VIAPTR(pScrn);
     VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
+    int             i;
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIABIOSInit\n"));
 
-    pBIOSInfo->bitsPerPixel = pScrn->bitsPerPixel;
-    pBIOSInfo->displayWidth = pScrn->displayWidth;
-    pBIOSInfo->frameX1 = pScrn->frameX1;
-    pBIOSInfo->frameY1 = pScrn->frameY1;
     pBIOSInfo->scrnIndex = pScrn->scrnIndex;
 
     pBIOSInfo->Clock = pMode->Clock;
@@ -2534,8 +2530,6 @@ static void VIABIOSInit(VIAPtr pVia, ScrnInfoPtr pScrn, DisplayModePtr pMode)
     pBIOSInfo->CrtcHDisplay = pMode->CrtcHDisplay;
     pBIOSInfo->CrtcVDisplay = pMode->CrtcVDisplay;
     if (pBIOSInfo->FirstInit) {
-        pBIOSInfo->SaveframeX1 = pScrn->frameX1;
-        pBIOSInfo->SaveframeY1 = pScrn->frameY1;
         pBIOSInfo->SaveHDisplay = pMode->HDisplay;
         pBIOSInfo->SaveVDisplay = pMode->VDisplay;
         pBIOSInfo->SaveCrtcHDisplay = pMode->CrtcHDisplay;
@@ -2554,16 +2548,15 @@ static void VIABIOSInit(VIAPtr pVia, ScrnInfoPtr pScrn, DisplayModePtr pMode)
 }
 
 
-static void VIAPostFindMode(VIAPtr pVia, ScrnInfoPtr pScrn, DisplayModePtr pMode)
+static void VIAPostFindMode(ScrnInfoPtr pScrn, DisplayModePtr pMode)
 {
+    VIAPtr pVia = VIAPTR(pScrn);
     VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
 
     pVia->ModeReg.mode = pBIOSInfo->ModeIndex;
     pVia->ModeReg.resMode = pBIOSInfo->ResolutionIndex;
     pVia->ModeReg.refresh = pBIOSInfo->RefreshIndex;
 
-    pScrn->frameX1 = pBIOSInfo->frameX1;
-    pScrn->frameY1 = pBIOSInfo->frameY1;
     pMode->HDisplay = pBIOSInfo->HDisplay;
     pMode->VDisplay = pBIOSInfo->VDisplay;
 
@@ -2574,7 +2567,6 @@ static Bool VIAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
     vgaHWPtr        hwp = VGAHWPTR(pScrn);
     VIAPtr          pVia = VIAPTR(pScrn);
-    VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
     VIARegPtr       new = &pVia->ModeReg;
     vgaRegPtr       vganew = &hwp->ModeReg;
     /* DDUPDATEOVERLAY UpdateOverlay; */
@@ -2588,15 +2580,15 @@ static Bool VIAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 
     pScrn->vtSema = TRUE;
 
-    VIABIOSInit(pVia, pScrn, mode);
+    VIABIOSInit(pScrn, mode);
 
-    if (!VIAFindModeUseBIOSTable(pBIOSInfo)) {
+    if (!VIAFindModeUseBIOSTable(pScrn)) {
         vgaHWBlankScreen(pScrn, TRUE);
         VIAFreeRec(pScrn);
         return FALSE;
     }
 
-    VIAPostFindMode(pVia, pScrn, mode);
+    VIAPostFindMode(pScrn, mode);
 
     /* FIXME - need DRI lock for this bit - see i810 */
     /* do it! */
@@ -2821,10 +2813,8 @@ static void VIADPMS(ScrnInfoPtr pScrn, int mode, int flags)
 
     switch (mode) {
     case DPMSModeOn:
-        if (pBIOSInfo->ActiveDevice & (VIA_DEVICE_DFP | VIA_DEVICE_LCD)) {
-            /* Enable LCD */
-            VIAEnableLCD(pBIOSInfo);
-        }
+        if (pBIOSInfo->ActiveDevice & (VIA_DEVICE_DFP | VIA_DEVICE_LCD))
+            VIAEnableLCD(pScrn);
 
         if (pBIOSInfo->ActiveDevice & VIA_DEVICE_TV) {
             dev = xf86CreateI2CDevRec();
@@ -2857,9 +2847,9 @@ static void VIADPMS(ScrnInfoPtr pScrn, int mode, int flags)
     case DPMSModeStandby:
     case DPMSModeSuspend:
     case DPMSModeOff:
-        if (pBIOSInfo->ActiveDevice & (VIA_DEVICE_DFP | VIA_DEVICE_LCD)) {
-            VIADisableLCD(pBIOSInfo);
-        }
+        if (pBIOSInfo->ActiveDevice & (VIA_DEVICE_DFP | VIA_DEVICE_LCD))
+            VIADisableLCD(pScrn);
+
         if (pBIOSInfo->ActiveDevice & VIA_DEVICE_TV) {
             dev = xf86CreateI2CDevRec();
             dev->DevName = "TV";