diff options
author | Thomas Winischhofer <thomas@winischhofer.net> | 2004-08-10 22:49:42 +0000 |
---|---|---|
committer | Thomas Winischhofer <thomas@winischhofer.net> | 2004-08-10 22:49:42 +0000 |
commit | 7266df7537cf2132145605404ebcdc5dad3aa77b (patch) | |
tree | 85bfd8554f568ef6e38de49f950eb8aa6e53f429 | |
parent | 1a5d711d1ef175bcda964ee37829b6ca63a3c8d7 (diff) |
SiS driver: Additional fixes for LCD
-rw-r--r-- | src/310vtbl.h | 8 | ||||
-rw-r--r-- | src/init301.c | 8 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/310vtbl.h b/src/310vtbl.h index b6b47fb..15302c9 100644 --- a/src/310vtbl.h +++ b/src/310vtbl.h @@ -846,14 +846,14 @@ static SiS_VBVCLKDataStruct SiS310_VBVCLKData[]= { 0x52,0x07,149}, /* 0x59 1280x960-85 */ { 0x56,0x07,156}, /* 0x5a 1400x1050-75 */ { 0x70,0x29, 81}, /* 0x5b 1280x768 LCD (TMDS) */ - { 0xCE,0x1E, 73}, /* 0x5c 1280x800 LCD - (CRT1: 45 25 83) */ + { 0xce,0x1e, 73}, /* 0x5c 1280x800 LCD - (CRT1: 45 25 83) */ { 0xbe,0x44,121}, /* 0x5d 1680x1050 LCD */ { 0x70,0x24,162}, /* 0x5e 1600x1200 LCD */ { 0x52,0x27, 75}, /* 0x5f 1280x720 (TMDS + HDTV) (correct) */ - { 0xC8,0x48, 77}, /* 0x60 1280x768_2 (LVDS) */ - { 0x31,0x42, 79}, /* 0x61 1280x768_3 (LVDS) - temp */ + { 0xc8,0x48, 77}, /* 0x60 1280x768_2 (SiS LVDS) */ + { 0x31,0x42, 79}, /* 0x61 1280x768_3 (SiS LVDS) - temp */ { 0, 0, 0}, /* 0x62 - custom (will be filled out at run-time) */ - { 0x5a,0x64, 65}, /* 0x63 1280x720 (LVDS) */ + { 0x9c,0x62, 69}, /* 0x63 1280x720 (SiS LVDS) */ { 0x70,0x28, 90}, /* 0x64 1152x864@60 */ { 0x41,0xc4, 32}, /* 0x65 848x480@60 */ { 0x5c,0xc6, 32}, /* 0x66 856x480@60 */ diff --git a/src/init301.c b/src/init301.c index b4ccdb1..9bd5205 100644 --- a/src/init301.c +++ b/src/init301.c @@ -2158,13 +2158,7 @@ SiS_GetVCLK2Ptr(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex, VCLKIndex = VCLKIndexGEN; switch(resinfo) { /* Only those whose IndexGEN doesn't match VBVCLK array: */ - case SIS_RI_1280x720: VCLKIndex = VCLK_1280x720; - if(SiS_Pr->SiS_LCDResInfo == Panel_1280x720) { - if(SiS_Pr->PanelHT != 1650) { - VCLKIndex = VCLK_1280x720_2; - } - } - break; + case SIS_RI_1280x720: VCLKIndex = VCLK_1280x720; break; case SIS_RI_720x480: VCLKIndex = VCLK_720x480; break; case SIS_RI_720x576: VCLKIndex = VCLK_720x576; break; case SIS_RI_768x576: VCLKIndex = VCLK_768x576; break; |