Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004xf86-4_4_99_1

39 files changed, 135 insertions, 80 deletions

diff --git a/README.sgml b/README.sgml
index 215ffb3..e2df88e 100644
--- a/README.sgml
+++ b/README.sgml
@@ -10,7 +10,7 @@
 <date>5 October 2003
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml,v 3.8 2003/10/19 19:29:14 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml,v 3.9 2004/02/15 02:16:49 dawes Exp $
 </ident>
 
 <!-- Table of contents -->
diff --git a/man/sis.man b/man/sis.man
index ae13b1d..2df72b6 100644
--- a/man/sis.man
+++ b/man/sis.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis.man,v 1.5 2001/12/17 20:52:34 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis.man,v 1.15 2004/02/29 19:54:14 twini Exp $
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH SIS __drivermansuffix__ __vendorversion__
@@ -45,7 +45,8 @@ for SiS300/305, 540 and 630/730
 .B 315/330 series
 for SiS315/H/PRO, 55x and (M)65x/(M)661xX/74x, 330, 760
 .PP
-Note: Support for 661FX, M661FX, M661MX, 741 and 760 is untested.
+Note: Support for 661FX, M661FX, M661MX, 741 and 760 is untested as regards
+video bridge output.
 .SH CONFIGURATION DETAILS
 Please refer to XF86Config(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
diff --git a/src/300vtbl.h b/src/300vtbl.h
index 5c418bd..0bd1cd5 100644
--- a/src/300vtbl.h
+++ b/src/300vtbl.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/300vtbl.h,v 1.25 2004/02/26 09:16:17 twini Exp $ */
 /*
  * Register settings for SiS 300 series
  *
diff --git a/src/310vtbl.h b/src/310vtbl.h
index 764a5f6..43425a1 100644
--- a/src/310vtbl.h
+++ b/src/310vtbl.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/310vtbl.h,v 1.26 2004/02/25 23:22:15 twini Exp $ */
 /*
  * Register settings for SiS 315/330 series
  *
diff --git a/src/init.c b/src/init.c
index f94f89e..c6a175d 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/init.c,v 1.54 2004/02/29 19:54:12 twini Exp $ */
 /*
  * Mode initializing code (CRT1 section) for
  * for SiS 300/305/540/630/730 and
@@ -995,14 +995,16 @@ SiS_GetModeID_TV(int VGAEngine, ULONG VBFlags, int HDisplay, int VDisplay, int D
 		   if((VBFlags & TV_YPBPR) || (VBFlags & (TV_NTSC | TV_PALM)))
                       ModeIndex = ModeIndex_720x480[Depth];
                 } else if(VDisplay == 576) {
-		   if((!(VBFlags & (TV_YPBPR | TV_PALM))) && (VBFlags & TV_PAL))
+		   if( ((VBFlags & TV_YPBPR) && (VBFlags & TV_YPBPR750P)) ||
+		       ((!(VBFlags & (TV_YPBPR | TV_PALM))) && (VBFlags & TV_PAL)) )
                       ModeIndex = ModeIndex_720x576[Depth];
                 }
 	     }
              break;
 	case 768:
 	     if((!(VBFlags & TV_HIVISION)) && (!((VBFlags & TV_YPBPR) && (VBFlags & TV_YPBPR1080I)))) {
-	        if((!(VBFlags & (TV_YPBPR | TV_PALM))) && (VBFlags & TV_PAL)) {
+	        if( ((VBFlags & TV_YPBPR) && (VBFlags & TV_YPBPR750P)) ||
+		    ((!(VBFlags & (TV_YPBPR | TV_PALM))) && (VBFlags & TV_PAL)) ) {
           	   if(VDisplay == 576) ModeIndex = ModeIndex_768x576[Depth];
 		}
              }
diff --git a/src/init.h b/src/init.h
index 9684c68..32f2634 100644
--- a/src/init.h
+++ b/src/init.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/init.h,v 1.49 2004/02/29 19:54:12 twini Exp $ */
 /*
  * Data and prototypes for init.c
  *
@@ -922,6 +922,19 @@ static const SiS_TVDataStruct  SiS_St750pData[] =
 
 static const SiS_TVDataStruct  SiS_Ext750pData[] =
 {
+#if 1
+ {  143,  65, 0x35a,0x1bb,0x4f6,0x1b8,0x0ab,  0, 0x0ab, 0x00,0x00,0x00,0x00},
+ {   88,  35, 0x35a,0x189,0x4f6,0x1b8,0x0ab,  0, 0x0ab, 0x00,0x00,0x00,0x00},
+ {   18,   5, 0x339,0x1ae,0x500,0x2d0,0x05c,  0, 0x05c, 0x00,0x00,0x00,0x00},
+ {  143,  70, 0x39c,0x189,0x4f6,0x1b8,0x05c,  0, 0x05c, 0x00,0x00,0x00,0x00},
+ {   99,  32, 0x320,0x1fe,0x500,0x2d0,   50,  0,     0, 0x00,0x00,0x00,0x00},  /* 640x480  */
+ {    5,   4, 0x5d8,0x29e,0x500,0x2a8,   50,  0,     0, 0x00,0x00,0x00,0x00},  /* 800x600  */
+ {    2,   1, 0x35a,0x1f7,0x4f6,0x1e0,    0,128,     0, 0x00,0x00,0x00,0x00},  /* 720x480  */
+ {   68,  64, 0x55f,0x346,0x500,0x2a8,0x27e,  0,     0, 0x00,0x00,0x00,0x00},  /* 1024x768 */
+ {    5,   2, 0x3a7,0x226,0x500,0x2a8,    0,128,     0, 0x00,0x00,0x00,0x00},  /* 720x576  */
+ {   25,  24, 0x5d8,0x2f3,0x460,0x2a8,   50,  0,     0, 0x00,0x00,0x00,0x00}   /* 1280x720 */
+#endif
+#if 0
  {    3,   1, 0x3a7,0x1d6,0x500,0x2a8,   50,  0,     0, 0x00,0x00,0x00,0x00},
  {   24,   7, 0x3a7,0x1a4,0x500,0x2a8,   50,  0,     0, 0x00,0x00,0x00,0x00},
  {    3,   1, 0x3a7,0x1d6,0x500,0x2a8,   50,  0,     0, 0x00,0x00,0x00,0x00},
@@ -931,6 +944,18 @@ static const SiS_TVDataStruct  SiS_Ext750pData[] =
  {    2,   1, 0x35a,0x1f7,0x4f6,0x1e0,    0,128,     0, 0x00,0x00,0x00,0x00},  /* 720x480   */
  {   68,  64, 0x55f,0x346,0x500,0x2a8,0x27e,  0,     0, 0x00,0x00,0x00,0x00},  /* 1024x768  */
  {   25,  24, 0x5d8,0x2f3,0x460,0x2a8,   50,  0,     0, 0x00,0x00,0x00,0x00}   /* 1280x720  */
+#endif
+#if 0
+ {  136,  35, 0x339,0x181,0x460,0x2a8,   50,  0,     0, 0x00,0x00,0x00,0x00},  /* TEST (0.93) */
+ {   17,   6, 0x339,0x203,0x460,0x2a8,   50,  0,    50, 0x00,0x00,0x00,0x00},
+ {  136,  35, 0x339,0x181,0x460,0x2a8,   50,  0,    50, 0x00,0x00,0x00,0x00},
+ {   17,   6, 0x339,0x203,0x460,0x2a8,   50,  0,    50, 0x00,0x00,0x00,0x00},
+ {   85,  46, 0x3f4,0x27b,0x460,0x2a8,   50,  0,     0, 0x00,0x00,0x00,0x00},  /* 640x480   */
+ {   17,  16, 0x55f,0x323,0x460,0x2a8,0x2b6,  0,     0, 0x00,0x00,0x00,0x00},  /* 800x600   */
+ {  136,  35, 0x339,0x181,0x460,0x2a8,   50,  0,     0, 0x00,0x00,0x00,0x00},  /* 720x480   */
+ {  187,  74, 0x39d,0x203,0x460,0x2a8,   50,  0,     0, 0x00,0x00,0x00,0x00},  /* 1024x768  */
+ {   25,  24, 0x5d8,0x2f3,0x460,0x2a8,   50,  0,    50, 0x00,0x00,0x00,0x00}   /* 1280x720  */
+#endif
 };
 
 static const SiS_LCDDataStruct  SiS_LCD1280x720Data[] =  
diff --git a/src/init301.c b/src/init301.c
index ab20ab6..7ddc801 100644
--- a/src/init301.c
+++ b/src/init301.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/init301.c,v 1.76 2004/03/10 18:12:34 tsi Exp $ */
 /*
  * Mode initializing code (CRT2 section)
  * for SiS 300/305/540/630/730 and
@@ -1569,7 +1569,7 @@ SiS_GetLCDResInfo(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,
      case Panel_1024x600:   SiS_Pr->PanelXRes = 1024; SiS_Pr->PanelYRes =  600;
      			    SiS_Pr->PanelHT   = 1344; SiS_Pr->PanelVT   =  800;
 			    SiS_Pr->PanelHRS  =   24; SiS_Pr->PanelHRE  =  136;
-			    SiS_Pr->PanelVRS  =   88; SiS_Pr->PanelVRE  =    6;
+			    SiS_Pr->PanelVRS  =    2 /* 88 */ ; SiS_Pr->PanelVRE  =    6;
      			    SiS_Pr->PanelVCLKIdx300 = VCLK65_300;
 			    SiS_Pr->PanelVCLKIdx315 = VCLK65_315;
      			    break;
@@ -1886,22 +1886,28 @@ SiS_GetLCDResInfo(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,
 	      if(SiS_Pr->SiS_LCDInfo & LCDPass11) {
 	         SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
 	      }
+	   } else if(ModeNo > 0x13) {
+	      if(SiS_Pr->SiS_LCDResInfo == Panel_1024x600) {
+	         if(!(SiS_Pr->SiS_LCDInfo & DontExpandLCD)) {
+	            if((resinfo == SIS_RI_800x600) || (resinfo == SIS_RI_400x300)) {
+                       SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
+		    }
+		 }
+	      }
 	   }
 	}
      }
 
      if(modeflag & HalfDCLK) {
-        if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) {
+        if(SiS_Pr->SiS_IF_DEF_TRUMPION == 1) {
+	   SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
+        } else if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) {
 	   SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
 	} else if(SiS_Pr->SiS_LCDResInfo == Panel_640x480) {
 	   SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
 	} else if(ModeNo > 0x13) {
            if(SiS_Pr->SiS_LCDResInfo == Panel_1024x768) {
               if(resinfo == SIS_RI_512x384) SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
-	   } else if(SiS_Pr->SiS_LCDResInfo == Panel_1024x600) {
-	      if((resinfo == SIS_RI_800x600) || (resinfo == SIS_RI_400x300)) {
-                 SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
-	      }
            } else if(SiS_Pr->SiS_LCDResInfo == Panel_800x600) {
               if(resinfo == SIS_RI_400x300) SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
            }
@@ -2783,7 +2789,11 @@ SiS_GetCRT2Ptr(SiS_Private *SiS_Pr,USHORT ModeNo,USHORT ModeIdIndex,
 	         if(resinfo == SIS_RI_1024x768) tempal = 8;
 	      }
 	      if(SiS_Pr->SiS_TVMode & TVSetYPbPr750p) {
-	         if(resinfo == SIS_RI_1280x720) tempal = 8;
+		 if((resinfo == SIS_RI_720x576) ||
+	            (resinfo == SIS_RI_768x576)) {
+	            tempal = 8;
+	         }
+		 if(resinfo == SIS_RI_1280x720) tempal = 9;
 	      }
 	   }
 	}
@@ -5686,12 +5696,6 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,
   if(tempax >= SiS_Pr->SiS_HT) tempax -= SiS_Pr->SiS_HT;
 
   temp = tempax;
-#if 0
-  /* TEST 2 */
-  if((HwInfo->jChipType >= SIS_315H) && (islvds) && (SiS_Pr->SiS_LCDResInfo == Panel_1400x1050)) {
-  } else
-  /* /TEST2 */
-#endif
   if(temp & 0x07) temp += 8;
   temp >>= 3;
   SiS_SetReg(SiS_Pr->SiS_Part1Port,0x17,temp);			/* BPLHDEE  */
@@ -5737,13 +5741,6 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,
      temp += 2;
      if(!(SiS_Pr->SiS_LCDInfo & LCDPass11)) {
         temp += 8;
-#if 0
-        /* TEST 1 */
-	if((HwInfo->jChipType >= SIS_315H) && (islvds) && (SiS_Pr->SiS_LCDResInfo == Panel_1400x1050)) {
-	   temp -= 16;
-	} else
-	/* /test1 */
-#endif
         if(SiS_Pr->PanelHRE != 999) {
            temp = tempcx + SiS_Pr->PanelHRE;
 	   if(temp >= SiS_Pr->SiS_HT) temp -= SiS_Pr->SiS_HT;
@@ -7005,7 +7002,7 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,USHORT Refr
 
   if(SiS_Pr->SiS_VBInfo & SetCRT2ToHiVision) 	tempax = 950;
   else if(SiS_Pr->SiS_TVMode & TVSetPAL)      	tempax = 520;
-  else 			            		tempax = 440;
+  else 			            		tempax = 440; /* NTSC, YPbPr 525, 750 */
 
   if( ( (!(SiS_Pr->SiS_VBInfo & SetCRT2ToTVNoHiVision)) && (SiS_Pr->SiS_VDE <= tempax) ) ||
       ( (SiS_Pr->SiS_VBInfo & SetCRT2ToTVNoHiVision) &&
@@ -7021,7 +7018,7 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,USHORT Refr
      temp = tempax + (USHORT)TimingPoint[1];
      SiS_SetReg(SiS_Pr->SiS_Part2Port,0x02,temp);
 
-     if((SiS_Pr->SiS_VBInfo & SetCRT2ToTVNoHiVision) && (SiS_Pr->SiS_VGAHDE >= 1024)) {
+     if((SiS_Pr->SiS_VBInfo & SetCRT2ToTVNoYPbPrHiVision) && (SiS_Pr->SiS_VGAHDE >= 1024)) {
         if(SiS_Pr->SiS_TVMode & TVSetPAL) {
            SiS_SetReg(SiS_Pr->SiS_Part2Port,0x01,0x1b);  /* 19 */
            SiS_SetReg(SiS_Pr->SiS_Part2Port,0x02,0x54);  /* 52 */
@@ -7137,6 +7134,16 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,USHORT Refr
   }
   SiS_SetReg(SiS_Pr->SiS_Part2Port,0x30,temp);
 
+  /* TEST qqqq */
+  if(SiS_Pr->SiS_VBInfo & SetCRT2ToYPbPr525750) {
+     for(i=0x01, j=0; i<=0x2D; i++, j++) {
+        SiS_SetReg(SiS_Pr->SiS_Part2Port,i,TimingPoint[j]);
+     }
+     for(i=0x39; i<=0x45; i++, j++) {
+        SiS_SetReg(SiS_Pr->SiS_Part2Port,i,TimingPoint[j]);
+     }
+  }
+
   if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
      tempbx = SiS_Pr->SiS_VDE;
      if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
@@ -7555,11 +7562,15 @@ static void
 SiS_SetGroup3(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,
               PSIS_HW_INFO HwInfo)
 {
-  USHORT modeflag, i;
+#if 0
+  USHORT modeflag;
+#endif
+  USHORT i;
   const UCHAR  *tempdi;
 
   if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA) return;
 
+#if 0
   if(ModeNo<=0x13) {
      modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
   } else if(SiS_Pr->UseCustomMode) {
@@ -7567,12 +7578,11 @@ SiS_SetGroup3(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,
   } else {
      modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
   }
+#endif
 
 #ifndef SIS_CP
   SiS_SetReg(SiS_Pr->SiS_Part3Port,0x00,0x00);
-#endif
-
-#ifdef SIS_CP
+#else
   SIS_CP_INIT301_CP
 #endif
 
diff --git a/src/init301.h b/src/init301.h
index 9e86ee1..7766716 100644
--- a/src/init301.h
+++ b/src/init301.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/init301.h,v 1.45 2004/02/29 19:54:14 twini Exp $ */
 /*
  * Data and prototypes for init301.c
  *
@@ -88,29 +88,41 @@ const UCHAR SiS_YPbPrTable[3][64] = {
     0x06,0x14,0x0d,0x04,0x0a,0x00,0x85,0x1b,
     0x0c,0x50,0x00,0x97,0x00,0xda,0x4a,0x17,
     0x7d,0x05,0x4b,0x00,0x00,0xe2,0x00,0x02,
-    0x03,0x0a,0x65,0x9d,0x08,0x92,0x8f,0x40,
-    0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x53,
+    0x03,0x0a,0x65,0x8d /*0x9d*/,0x08,0x92,0x8f,0x40,
+    0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x50 /*0x53*/,
     0x00,0x40,0x44,0x00,0xdb,0x02,0x3b,0x00
   },
   {
     0x1d,0x11,0x06,0x09,0x0b,0x0c,0x0c,0x0c,
     0x98,0x0a,0x01,0x0d,0x06,0x0d,0x04,0x0a,
     0x06,0x14,0x0d,0x04,0x0a,0x00,0x85,0x3f,
-    0x0c,0x50,0xb2,0x9f,0x16,0x59,0x4f,0x13,
+    0x0c,0x50,0xb2,0x9f,0x16,0x59,0x4c /*0x4f*/,0x13,
     0xad,0x11,0xad,0x1d,0x40,0x8a,0x3d,0xb8,
-    0x51,0x5e,0x60,0x49,0x7d,0x92,0x0f,0x40,
+    0x51,0x5e,0x60,0x57 /*0x49*/,0x7b /*0x7d*/,0x92,0x0f,0x40,
     0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x4b,
     0x43,0x41,0x11,0x00,0xfc,0xff,0x32,0x00
   },
   {
+#if 1
     0x13,0x1d,0xe8,0x09,0x09,0xed,0x0c,0x0c,
     0x98,0x0a,0x01,0x0c,0x06,0x0d,0x04,0x0a,
     0x06,0x14,0x0d,0x04,0x0a,0x00,0x85,0x3f,
-    0xed,0x50,0x70,0x9f,0x16,0x59,0x2b,0x13,
+    0xed,0x50,0x70,0x9f,0x16,0x59,0x21 /*0x2b*/,0x13,
     0x27,0x0b,0x27,0xfc,0x30,0x27,0x1c,0xb0,
-    0x4b,0x4b,0x6f,0x2f,0x63,0x92,0x0f,0x40,
+    0x4b,0x4b,0x65 /*0x6f*/,0x2f,0x63,0x92,0x0f,0x40,
     0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x27,
     0x00,0x40,0x11,0x00,0xfc,0xff,0x32,0x00
+#endif
+#if 0
+    0x2a,0x14,0xe8,0x09,0x09,0xed,0x0c,0x0c,  /* TEST (0.93) - BAD */
+    0x98,0x0a,0x01,0x0c,0x06,0x0d,0x04,0x0a,
+    0x06,0x14,0x0d,0x04,0x0a,0x00,0x85,0x3f,
+    0xed,0x50,0x70,0x9e,0x16,0x57,0x6c,0x13,
+    0x27,0x0b,0x27,0xfb,0x30,0x27,0x15,0xb0,
+    0x3b,0xdb,0x61,0x24,0x78,0x92,0x0f,0xff,
+    0xff,0xff,0xff,0xff,0xff,0xff,0x14,0x6f,
+    0x00,0x52,0xbb,0x00,0xd5,0xf7,0xa2,0x00
+#endif
   }
 };
 
@@ -136,7 +148,7 @@ const UCHAR SiS_HiTVGroup3_2[] = {
     0x18, 0x1d, 0x23, 0x28, 0x4c, 0xaa, 0x01
 };
 
-/* 301C / 302ELV (?) extended Part2 TV registers */
+/* 301C / 302ELV extended Part2 TV registers */
 
 static const UCHAR SiS_Part2CLVX_1[] = {
     0x00,0x00,
diff --git a/src/initdef.h b/src/initdef.h
index 869364c..a5c7382 100644
--- a/src/initdef.h
+++ b/src/initdef.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/initdef.h,v 1.34 2004/02/25 17:45:11 twini Exp $ */
 /*
  * Global definitions for init.c and init301.c
  *
diff --git a/src/oem300.h b/src/oem300.h
index 7995893..ba9b24d 100644
--- a/src/oem300.h
+++ b/src/oem300.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/oem300.h,v 1.16 2004/02/25 17:45:11 twini Exp $ */
 /*
  * OEM Data for 300 series
  *
diff --git a/src/oem310.h b/src/oem310.h
index f76b136..d5047c6 100644
--- a/src/oem310.h
+++ b/src/oem310.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/oem310.h,v 1.26 2004/02/25 17:45:11 twini Exp $ */
 /*
  * OEM Data for 315/330 series
  *
diff --git a/src/osdef.h b/src/osdef.h
index 663b976..f922050 100644
--- a/src/osdef.h
+++ b/src/osdef.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/osdef.h,v 1.10 2004/02/25 17:45:11 twini Exp $ */
 /*
  * OS depending defines
  *
diff --git a/src/sis.h b/src/sis.h
index 6d719e8..8b77601 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis.h,v 1.113 2004/03/06 13:21:24 twini Exp $ */
 /*
  * Main global data and definitions
  *
@@ -38,8 +38,8 @@
 #define UNLOCK_ALWAYS
 
 #define SISDRIVERVERSIONYEAR    4
-#define SISDRIVERVERSIONMONTH   2
-#define SISDRIVERVERSIONDAY     26
+#define SISDRIVERVERSIONMONTH   3
+#define SISDRIVERVERSIONDAY     6
 #define SISDRIVERREVISION       1
 
 #define SISDRIVERIVERSION (SISDRIVERVERSIONYEAR << 16) |  \
diff --git a/src/sis300_accel.c b/src/sis300_accel.c
index 568fe63..01cba35 100644
--- a/src/sis300_accel.c
+++ b/src/sis300_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c,v 1.29 2004/02/25 17:45:11 twini Exp $ */
 /*
  * 2D Acceleration for SiS 530, 620, 300, 540, 630, 730.
  *
diff --git a/src/sis300_accel.h b/src/sis300_accel.h
index e33fdbe..546a100 100644
--- a/src/sis300_accel.h
+++ b/src/sis300_accel.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.h,v 1.21 2004/02/25 17:45:11 twini Exp $ */
 /*
  * 2D Acceleration for SiS 530, 620, 300, 540, 630, 730.
  * Definitions for the SIS engine communication
diff --git a/src/sis310_accel.c b/src/sis310_accel.c
index 4f26e06..fb4dc33 100644
--- a/src/sis310_accel.c
+++ b/src/sis310_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis310_accel.c,v 1.41 2004/02/25 17:45:11 twini Exp $ */
 /*
  * 2D Acceleration for SiS 315 and 330 series
  *
diff --git a/src/sis310_accel.h b/src/sis310_accel.h
index d782cf5..bfb745f 100644
--- a/src/sis310_accel.h
+++ b/src/sis310_accel.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis310_accel.h,v 1.19 2004/02/25 17:45:11 twini Exp $ */
 /*
  * 2D Acceleration for SiS 315 and Xabre series
  * Definitions for the SIS engine communication.
diff --git a/src/sis6326_video.c b/src/sis6326_video.c
index fa3b556..ec01166 100644
--- a/src/sis6326_video.c
+++ b/src/sis6326_video.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis6326_video.c,v 1.19 2004/02/25 17:45:12 twini Exp $ */
 /*
  * Xv driver for SiS 5597/5598, 6236 and 530/620.
  *
diff --git a/src/sis_accel.c b/src/sis_accel.c
index 5a4488c..ca23d8a 100644
--- a/src/sis_accel.c
+++ b/src/sis_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c,v 1.38 2004/02/25 17:45:12 twini Exp $ */
 /*
  * 2D acceleration for SiS5597/5598 and 6326
  *
diff --git a/src/sis_accel.h b/src/sis_accel.h
index cf37d91..d1ef956 100644
--- a/src/sis_accel.h
+++ b/src/sis_accel.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.h,v 1.12 2004/02/25 17:45:13 twini Exp $ */
 /*
  * 2D acceleration for 5597/5598 and 6326
  * Definitions for the SIS engine communication
diff --git a/src/sis_common.h b/src/sis_common.h
index dbca0fd..0aa6599 100644
--- a/src/sis_common.h
+++ b/src/sis_common.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_common.h,v 1.3 2004/01/03 20:08:02 twini Exp $ */
 /*
  * Common header definitions for SiS 2D/3D/DRM suite
  *
diff --git a/src/sis_cursor.c b/src/sis_cursor.c
index 0ebb44d..88b6748 100644
--- a/src/sis_cursor.c
+++ b/src/sis_cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_cursor.c,v 1.29 2004/02/25 17:45:13 twini Exp $ */
 /*
  * SiS hardware cursor handling
  *
diff --git a/src/sis_cursor.h b/src/sis_cursor.h
index c38d038..34ab0e2 100644
--- a/src/sis_cursor.h
+++ b/src/sis_cursor.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_cursor.h,v 1.17 2004/02/25 17:45:13 twini Exp $ */
 /*
  * SiS hardware cursor handling
  * Definitions
diff --git a/src/sis_dac.c b/src/sis_dac.c
index 296e808..7a7cd46 100644
--- a/src/sis_dac.c
+++ b/src/sis_dac.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dac.c,v 1.61 2004/02/25 23:22:16 twini Exp $ */
 /*
  * DAC helper functions (Save/Restore, MemClk, etc)
  *
diff --git a/src/sis_dac.h b/src/sis_dac.h
index cbce161..bde7e76 100644
--- a/src/sis_dac.h
+++ b/src/sis_dac.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dac.h,v 1.20 2004/02/25 17:45:13 twini Exp $ */
 /*
  * DAC helper functions (Save/Restore, MemClk, etc)
  * Definitions and prototypes
diff --git a/src/sis_dga.c b/src/sis_dga.c
index a806cec..ba65be4 100644
--- a/src/sis_dga.c
+++ b/src/sis_dga.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dga.c,v 1.13 2004/01/04 18:08:00 twini Exp $ */
 /*
  * SiS DGA handling
  *
diff --git a/src/sis_dri.c b/src/sis_dri.c
index c143d2f..7eb8b17 100644
--- a/src/sis_dri.c
+++ b/src/sis_dri.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c,v 1.41 2004/01/04 18:08:00 twini Exp $ */
 /*
  * DRI wrapper for 300 and 315 series
  *
diff --git a/src/sis_dri.h b/src/sis_dri.h
index 29ce331..f527392 100644
--- a/src/sis_dri.h
+++ b/src/sis_dri.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.h,v 1.12 2004/01/04 18:08:00 twini Exp $ */
 /*
  * SiS DRI wrapper
  *
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 1ea6621..b7e2823 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c,v 1.187 2004/03/06 16:29:05 twini Exp $ */
 /*
  * SiS driver main code
  *
@@ -2835,6 +2835,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
 
     /*
      * The first thing we should figure out is the depth, bpp, etc.
+     * Set SupportConvert... flags since we use the fb layer which
+     * supports this conversion. (24to32 seems not implemented though)
      * Additionally, determine the size of the HWCursor memory area.
      */
     switch(pSiS->VGAEngine) {
@@ -2848,12 +2850,15 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
 	break;
       case SIS_530_VGA:
         pSiS->CursorSize = 2048;
-    	pix24flags = Support32bppFb |
-	             Support24bppFb;
+    	pix24flags = Support32bppFb 	  |
+	             Support24bppFb 	  |
+		     SupportConvert32to24;
         break;
       default:
         pSiS->CursorSize = 2048;
-        pix24flags = Support24bppFb;
+        pix24flags = Support24bppFb 	  |
+		     SupportConvert32to24 |
+		     PreferConvert32to24;
 	break;
     }
 
diff --git a/src/sis_driver.h b/src/sis_driver.h
index d76cde0..4b47c39 100644
--- a/src/sis_driver.h
+++ b/src/sis_driver.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.h,v 1.38 2004/02/25 17:45:13 twini Exp $ */
 /*
  * Global data and definitions
  *
diff --git a/src/sis_opt.c b/src/sis_opt.c
index b3dc1e7..4af0040 100644
--- a/src/sis_opt.c
+++ b/src/sis_opt.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_opt.c,v 1.57 2004/02/25 17:45:13 twini Exp $ */
 /*
  * SiS driver option evaluation
  *
diff --git a/src/sis_regs.h b/src/sis_regs.h
index b4f29fa..50ee4fd 100644
--- a/src/sis_regs.h
+++ b/src/sis_regs.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_regs.h,v 1.29 2004/02/25 17:45:13 twini Exp $ */
 /*
  * Register definitions for old and 300 series
  *
diff --git a/src/sis_setup.c b/src/sis_setup.c
index 884e03a..3b1093d 100644
--- a/src/sis_setup.c
+++ b/src/sis_setup.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_setup.c,v 1.31 2004/02/25 17:45:13 twini Exp $ */
 /*
  * Basic hardware and memory detection
  *
diff --git a/src/sis_shadow.c b/src/sis_shadow.c
index e2c4a11..29e4ede 100644
--- a/src/sis_shadow.c
+++ b/src/sis_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_shadow.c,v 1.10 2004/01/04 18:08:00 twini Exp $ */
 /*
  * Copyright (C) 1999-2004 by The XFree86 Project, Inc.
  * based on code written by Mark Vojkovich
diff --git a/src/sis_vb.c b/src/sis_vb.c
index c2f578d..29f8714 100644
--- a/src/sis_vb.c
+++ b/src/sis_vb.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_vb.c,v 1.45 2004/02/25 23:22:20 twini Exp $ */
 /*
  * Video bridge detection and configuration for 300, 315 and 330 series
  *
diff --git a/src/sis_vga.c b/src/sis_vga.c
index 9ce8b78..1cd7a78 100644
--- a/src/sis_vga.c
+++ b/src/sis_vga.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_vga.c,v 1.46 2004/02/26 15:07:02 twini Exp $ */
 /*
  * Mode setup and basic video bridge detection
  *
diff --git a/src/sis_video.c b/src/sis_video.c
index 85d75b5..e835c0c 100644
--- a/src/sis_video.c
+++ b/src/sis_video.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_video.c,v 1.50 2004/02/25 17:45:14 twini Exp $ */
 /*
  * Xv driver for SiS 300, 315 and 330 series.
  *
diff --git a/src/vgatypes.h b/src/vgatypes.h
index 634190b..c9fc17f 100644
--- a/src/vgatypes.h
+++ b/src/vgatypes.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/vgatypes.h,v 1.23 2004/02/25 17:45:14 twini Exp $ */
 /*
  * General type definitions for universal mode switching modules
  *
diff --git a/src/vstruct.h b/src/vstruct.h
index 262ec3f..b9127ad 100644
--- a/src/vstruct.h
+++ b/src/vstruct.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/vstruct.h,v 1.35 2004/02/25 22:40:46 twini Exp $ */
 /*
  * General structure definitions for universal mode switching modules
  *