DRI trunk-20040613 importDRI-trunk-20040721DRI-trunk-20040613COMPOSITEWRAP

1 files changed, 6 insertions, 30 deletions

diff --git a/src/savage_cursor.c b/src/savage_cursor.c
index 16aaabf..614b3e5 100644
--- a/src/savage_cursor.c
+++ b/src/savage_cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_cursor.c,v 1.9 2003/01/18 15:22:29 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_cursor.c,v 1.6 2001/11/02 16:24:51 alanh Exp $ */
 
 /*
  * Hardware cursor support for S3 Savage 4.0 driver. Taken with
@@ -24,7 +24,9 @@ static void SavageSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg);
 #define outCRReg(reg, val) (VGAHWPTR(pScrn))->writeCrtc( VGAHWPTR(pScrn), reg, val )
 #define inSRReg(reg) (VGAHWPTR(pScrn))->readSeq( VGAHWPTR(pScrn), reg )
 #define outSRReg(reg, val) (VGAHWPTR(pScrn))->writeSeq( VGAHWPTR(pScrn), reg, val )
+#if 0
 #define inStatus1() (VGAHWPTR(pScrn))->readST01( VGAHWPTR(pScrn) )
+#endif
 
 /* 
  * certain HW cursor operations seem 
@@ -39,27 +41,6 @@ static void SavageSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg);
                       } 
 #define MAX_CURS 64
 
-/*
- * Disable HW Cursor on stretched LCDs. We don't know how to
- * detect if display is stretched. Therefore we cannot rescale
- * the HW cursor position.
- */
-
-static Bool
-SavageUseHWCursor(ScreenPtr pScr, CursorPtr pCurs)
-{
-    ScrnInfoPtr pScrn = xf86Screens[pScr->myNum];
-    SavagePtr psav = SAVPTR(pScrn);
-
-    if (psav->PanelX != pScrn->currentMode->HDisplay 
-	|| psav->PanelY != pScrn->currentMode->VDisplay) {
-	/* BIT 1 : CRT is active, BIT 2 : LCD is active */
-	unsigned char cr6d = inCRReg( 0x6d );
-	if (cr6d & 0x02)
-	    return FALSE;
-    }
-    return TRUE;
-}
 
 Bool 
 SavageHWCursorInit(ScreenPtr pScreen)
@@ -101,12 +82,8 @@ SavageHWCursorInit(ScreenPtr pScreen)
     infoPtr->LoadCursorImage = SavageLoadCursorImage;
     infoPtr->HideCursor = SavageHideCursor;
     infoPtr->ShowCursor = SavageShowCursor;
+    infoPtr->UseHWCursor = NULL;
 
-    if ((S3_SAVAGE_MOBILE_SERIES(psav->Chipset)
-	 || (psav->Chipset == S3_PROSAVAGE)) && !psav->CrtOnly)
-	infoPtr->UseHWCursor = SavageUseHWCursor;
-    else
-	infoPtr->UseHWCursor = NULL;
     if( !psav->CursorKByte )
 	psav->CursorKByte = pScrn->videoRam - 4;
 
@@ -118,9 +95,8 @@ SavageHWCursorInit(ScreenPtr pScreen)
 void
 SavageShowCursor(ScrnInfoPtr pScrn)
 {
-    /* Turn cursor on. */
+   /* Turn cursor on. */
    outCRReg( 0x45, inCRReg(0x45) | 0x01 );
-   SAVPTR(pScrn)->hwc_on = TRUE;
 }
 
 
@@ -128,12 +104,12 @@ void
 SavageHideCursor(ScrnInfoPtr pScrn)
 {
     /* Turn cursor off. */
+
     if( S3_SAVAGE4_SERIES( SAVPTR(pScrn)->Chipset ) )
     {
        waitHSync(5);
     }
     outCRReg( 0x45, inCRReg(0x45) & 0xfe );
-    SAVPTR(pScrn)->hwc_on = FALSE;
 }
 
 static void