Remove support for non-shadowfb banked framebuffer

Signed-off-by: Adam Jackson <ajax@redhat.com>

2 files changed, 3 insertions, 22 deletions

diff --git a/src/vesa.c b/src/vesa.c
index 3b4423c..76a85eb 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -1045,22 +1045,9 @@ VESAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 	pScreen->CreateScreenResources = vesaCreateScreenResources;
     }
     else if (pVesa->mapPhys == 0xa0000) {
-	unsigned int bankShift = 0;
-	while ((unsigned)(64 >> bankShift) != mode->WinGranularity)
-	    bankShift++;
-	pVesa->curBank = -1;
-	pVesa->bank.SetSourceBank =
-	pVesa->bank.SetDestinationBank =
-	pVesa->bank.SetSourceAndDestinationBanks = VESABankSwitch;
-	pVesa->bank.pBankA = pVesa->bank.pBankB = pVesa->base;
-	pVesa->bank.BankSize = (mode->WinSize * 1024) >> bankShift;
-	pVesa->bank.nBankDepth = pScrn->depth;
-	if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY,
-				 pScrn->virtualX, &pVesa->bank)) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "Bank switch initialization failed!\n");
-	    return (FALSE);
-	}
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                   "Banked framebuffer requires ShadowFB\n");
+        return FALSE;
     }
 
     VESADGAInit(pScrn, pScreen);
diff --git a/src/vesa.h b/src/vesa.h
index d5c69a9..4656e4c 100644
--- a/src/vesa.h
+++ b/src/vesa.h
@@ -64,14 +64,9 @@
 /* Int 10 support */
 #include "xf86int10.h"
 
-/* bank switching */
-#include "mibank.h"
-
 /* Dga definitions */
 #include "dgaproc.h"
 
-
-
 #include "fb.h"
 
 #ifdef XSERVER_LIBPCIACCESS
@@ -99,7 +94,6 @@ typedef struct _VESARec
     pciVideoPtr pciInfo;
     PCITAG pciTag;
 #endif
-    miBankInfoRec bank;
     int curBank, bankSwitchWindowB;
     CARD16 maxBytesPerScanline;
     unsigned long mapPhys, mapOff, mapSize;	/* video memory */