vserver 1.9.5.x5

[linux-2.6.git] / drivers / video / sis / initdef.h

diff --git a/drivers/video/sis/initdef.h b/drivers/video/sis/initdef.h
index e030d3e..55a82d6 100644 (file)
--- a/drivers/video/sis/initdef.h
+++ b/drivers/video/sis/initdef.h
@@ -35,7 +35,7 @@
  * * 3) The name of the author may not be used to endorse or promote products
  * *    derived from this software without specific prior written permission.
  * *
- * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED OR
+ * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
@@ -80,6 +80,7 @@
 #define VB_SIS302LV            0x0010
 #define VB_SIS302ELV           0x0020
 #define VB_SIS301C              0x0040
+#define VB_UMC                 0x4000
 #define VB_NoLCD               0x8000
 #define VB_SIS301BLV302BLV      (VB_SIS301B|VB_SIS301C|VB_SIS302B|VB_SIS301LV|VB_SIS302LV|VB_SIS302ELV)
 #define VB_SIS301B302B          (VB_SIS301B|VB_SIS301C|VB_SIS302B)
@@ -87,6 +88,9 @@
 #define VB_SISVB               (VB_SIS301 | VB_SIS301BLV302BLV)
 #define VB_SISTMDS             (VB_SIS301 | VB_SIS301B302B)
 #define VB_SISLVDS             VB_SIS301LV302LV
+#define VB_SISLCDA             (VB_SIS302B|VB_SIS301C|VB_SIS301LV|VB_SIS302LV|VB_SIS302ELV)
+#define VB_SISYPBPR            (VB_SIS301C|VB_SIS301LV|VB_SIS302LV|VB_SIS302ELV)
+#define VB_SISHIVISION         (VB_SIS301|VB_SIS301B|VB_SIS302B)
 
 /* VBInfo */
 #define SetSimuScanMode         0x0001   /* CR 30 */
@@ -126,7 +130,7 @@
 #define Mode24Bpp               0x06
 #define Mode32Bpp               0x07
 
-#define ModeInfoFlag            0x07
+#define ModeTypeMask            0x07
 #define IsTextMode              0x07
 
 #define DACInfoFlag             0x0018
@@ -139,7 +143,7 @@
 #define CRT2Mode                0x0800
 #define HalfDCLK                0x1000
 #define NoSupportSimuTV         0x2000
-#define NoSupportLCDScale      0x4000 /* TMDS: No scaling possible (no matter what panel) */
+#define NoSupportLCDScale      0x4000 /* SiS bridge: No scaling possible (no matter what panel) */
 #define DoubleScanMode          0x8000
 
 /* Infoflag */
@@ -402,17 +406,18 @@
 #define Panel_1400x1050         0x09
 #define Panel_1280x768          0x0a    /* 30xB/C and LVDS only (BIOS: all) */
 #define Panel_1600x1200         0x0b
-#define Panel_1280x800         0x0c    /* 661etc  */
+#define Panel_1280x800         0x0c    /* 661etc (TMDS) */
 #define Panel_1680x1050         0x0d    /* 661etc  */
 #define Panel_1280x720         0x0e    /* 661etc  */
-#define Panel_Custom           0x0f    /* MUST BE 0x0f (for DVI DDC detection */
+#define Panel_Custom           0x0f    /* MUST BE 0x0f (for DVI DDC detection) */
 #define Panel_320x480           0x10    /* SiS 550 fstn - TW: This is fake, can be any */
 #define Panel_Barco1366         0x11
 #define Panel_848x480          0x12
 #define Panel_640x480_2                0x13    /* SiS 550 */
 #define Panel_640x480_3                0x14    /* SiS 550 */
 #define Panel_1280x768_2        0x15   /* 30xLV */
-#define Panel_1280x768_3        0x16    /* 30xLV */
+#define Panel_1280x768_3        0x16    /* (unused) */
+#define Panel_1280x800_2       0x17    /* 30xLV */
 
 /* Index in ModeResInfo table */
 #define SIS_RI_320x200    0
@@ -448,6 +453,7 @@
 #define SIS_RI_1280x800  30
 #define SIS_RI_1920x1080 31
 #define SIS_RI_960x540   32
+#define SIS_RI_960x600   33
 
 /* CR5F */
 #define IsM650                  0x80
@@ -475,7 +481,7 @@
 #define VCLK108_3_300           0x42   /* Index in VCLKData table (300) */
 #define VCLK100_300             0x43   /* Index in VCLKData table (300) */
 #define VCLK34_300              0x3d   /* Index in VCLKData table (300) */
-#define VCLK_CUSTOM_300                0x46
+#define VCLK_CUSTOM_300                0x47
 #define VCLK65_315              0x0b   /* Index in (VB)VCLKData table (315) */
 #define VCLK108_2_315           0x19   /* Index in (VB)VCLKData table (315) */
 #define VCLK81_315             0x5b   /* Index in (VB)VCLKData table (315) */
@@ -484,12 +490,11 @@
 #define VCLK100_315             0x46   /* Index in VBVCLKData table (315) */
 #define VCLK34_315              0x55
 #define VCLK68_315             0x0d
-#define VCLK69_315             0x5c   /* deprecated ! Index in VBVCLKData table (315) */
-#define VCLK83_315             0x5c   /* Index in VBVCLKData table (315) */
+#define VCLK_1280x800_315_2    0x5c   /* Index in VBVCLKData table (315) */
 #define VCLK121_315            0x5d   /* Index in VBVCLKData table (315) */
 #define VCLK_1280x720          0x5f
 #define VCLK_1280x768_2                0x60
-#define VCLK_1280x768_3                0x61
+#define VCLK_1280x768_3                0x61   /* (unused?) */
 #define VCLK_CUSTOM_315                0x62
 #define VCLK_1280x720_2                0x63
 #define VCLK_720x480           0x67
@@ -501,6 +506,7 @@
 #define VCLK_1024x576          0x51
 #define VCLK_1152x864          0x64
 #define VCLK_1360x768          0x58
+#define VCLK_1280x800_315      0x6c
 
 #define TVCLKBASE_300          0x21   /* Indices on TV clocks in VCLKData table (300) */
 #define TVCLKBASE_315          0x3a   /* Indices on TV clocks in (VB)VCLKData table (315) */