disable (for now) older acceleration init code for the streams processorsavage-1_0_0-20031002-trunk-premergesavage-1_0_0-branch

2 files changed, 7 insertions, 3 deletions

diff --git a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c
index c44a1d3b3..1c70e9156 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c
@@ -223,6 +223,8 @@ SavageInitialize2DEngine(ScrnInfoPtr pScrn)
     unsigned int vgaCRIndex = hwp->IOBase + 4;
     unsigned int vgaCRReg = hwp->IOBase + 5;
 
+return;
+
     gpScrn = pScrn;
 
     VGAOUT16(vgaCRIndex, 0x0140);
@@ -326,6 +328,8 @@ SavageSetGBD( ScrnInfoPtr pScrn )
     unsigned int vgaCRReg = hwp->IOBase + 5;
     unsigned long GlobalBitmapDescriptor;
 
+return;
+
     GlobalBitmapDescriptor = 1 | 8 | BCI_BD_BW_DISABLE;
     BCI_BD_SET_BPP(GlobalBitmapDescriptor, pScrn->bitsPerPixel);
     BCI_BD_SET_STRIDE(GlobalBitmapDescriptor, pScrn->displayWidth);
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c
index a9922f36f..84d20e20e 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c
@@ -1640,8 +1640,8 @@ static void SavageLeaveVT(int scrnIndex, int flags)
         psav->LockHeld = 1;
     }
 #endif
-    SavageEnableMode(pScrn, FALSE);
     SavageWriteMode(pScrn, vgaSavePtr, SavageSavePtr, FALSE);
+    SavageEnableMode(pScrn, FALSE);
     SavageDisableMMIO(pScrn);
 }
 
@@ -3001,8 +3001,8 @@ static Bool SavageModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
     pScrn->vtSema = TRUE;
 
     /* do it! */
-    SavageEnableMode(pScrn, TRUE);
     SavageWriteMode(pScrn, vganew, new, TRUE);
+    SavageEnableMode(pScrn, TRUE);
     SavageAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
 
 #ifdef XF86DRI
@@ -3048,8 +3048,8 @@ static Bool SavageCloseScreen(int scrnIndex, ScreenPtr pScreen)
     }
 
     if (pScrn->vtSema) {
-    	SavageEnableMode(pScrn, FALSE);
 	SavageWriteMode(pScrn, vgaSavePtr, SavageSavePtr, FALSE);
+    	SavageEnableMode(pScrn, FALSE);
 	vgaHWLock(hwp);
 	SavageUnmapMem(pScrn, 0);
     }