- Add PROSAVAGEDDR and TWISTER to BCI setup function (this should fix your problem Felix)

- clean up
- fixed warning in savage_bci.h

3 files changed, 24 insertions, 10 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 fedf0ab36..404b48f67 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c
@@ -274,7 +274,8 @@ SavageInitialize2DEngine(ScrnInfoPtr pScrn)
 	/* Disable BCI */
 	OUTREG(0x48C18, INREG(0x48C18) & 0x3FF0);
 	/* Setup BCI command overflow buffer */
-	OUTREG(0x48C14, (psav->cobOffset >> 11) | (psav->cobIndex << 29));
+	OUTREG(0x48C14, (psav->cobOffset >> 11) | (psav->cobIndex << 29)); /* tim */
+    	/*OUTREG(S3_OVERFLOW_BUFFER, psav->cobOffset >> 11 | 0xE0000000);*/ /* S3 */
 	/* Program shadow status update. */
 	OUTREG(0x48C10, 0x78207220);
 	if( psav->ShadowStatus )
@@ -292,12 +293,15 @@ SavageInitialize2DEngine(ScrnInfoPtr pScrn)
 	break;
 
     case S3_SAVAGE4:
+    case S3_TWISTER:
     case S3_PROSAVAGE:
-    case S3_SUPERSAVAGE:
+    case S3_PROSAVAGEDDR:
+    case S3_SUPERSAVAGE: /* AGD: S3 does supersavage differently. we may have to fix this. */
 	/* Disable BCI */
 	OUTREG(0x48C18, INREG(0x48C18) & 0x3FF0);
-	/* Program shadow status update */
-	OUTREG(0x48C10, 0x00700040);
+	/* Program shadow status update */ /* AGD: what should this be? */
+	OUTREG(0x48C10, 0x00700040); /* tim */
+        /*OUTREG(0x48C10, 0x0e440f04L);*/ /* S3 */
 	if( psav->ShadowStatus )
 	{
 	    OUTREG(0x48C0C, psav->ShadowPhysical | 1 );
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_bci.h b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_bci.h
index 348a2e3fd..15ccb37c3 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_bci.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_bci.h
@@ -15,14 +15,14 @@
  */
 
 
-#if SAVAGE4
+#if 0 /* savage4 */
     #define   TILE_LINEAR                   0
     #define   TILE_FORMAT_LINEAR            0
     #define   TILE_TEXTURE                  2
     #define   TILE_DESTINATION              1
     #define   TILE_FORMAT_DESTINATION16     2
     #define   TILE_FORMAT_DESTINATION32     3
-#else
+#endif
     #define   TILE_LINEAR                   0
     #define   TILE_FORMAT_LINEAR            0
     #define   TILE_TEXTURE                  2
@@ -30,13 +30,13 @@
     #define   TILE_FORMAT_DESTINATION       1
     #define   TILE_FORMAT_DESTINATION16     1
     #define   TILE_FORMAT_DESTINATION32     1
-#endif
 
-#if SAVAGE4
+
+#if 0 /* savage4 */
     #define   BCI_ENABLE                    8
-#else
-    #define   BCI_ENABLE                    0
 #endif
+    #define   BCI_ENABLE                    0
+
 
 #define   S3_BIG_ENDIAN                    4
 #define   S3_LITTLE_ENDIAN                 0
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 3c9e7f605..e97ee137e 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c
@@ -346,6 +346,14 @@ static const char *ddcSymbols[] = {
 static const char *i2cSymbols[] = {
     "xf86CreateI2CBusRec",
     "xf86I2CBusInit",
+    "xf86CreateI2CDevRec",
+    "xf86I2CDevInit",
+    "xf86I2CWriteByte",
+    "xf86I2CWriteBytes",
+    "xf86I2CReadByte",
+    "xf86I2CReadBytes",
+    "xf86I2CWriteRead",
+    "xf86DestroyI2CDevRec",
     NULL
 };
 
@@ -356,7 +364,9 @@ static const char *xaaSymbols[] = {
     "XAADestroyInfoRec",
     "XAAFillSolidRects",
     "XAAHelpPatternROP",
+#if 0 /* AGD: this is unresolved... */
     "XAAHelpSolidROP",
+#endif 
     "XAAInit",
     "XAAScreenIndex",
     NULL