|
@@ -6848,8 +6848,6 @@ SiS_SetGroup2(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short
|
|
|
if(SiS_Pr->SiS_VGAHDE >= 1280) {
|
|
|
tempch = 20;
|
|
|
tempbx &= ~0x20;
|
|
|
- } else if(SiS_Pr->SiS_VGAHDE >= 1024) {
|
|
|
- tempch = 25;
|
|
|
} else {
|
|
|
tempch = 25; /* OK */
|
|
|
}
|
|
@@ -7964,14 +7962,9 @@ SiS_SetCHTVReg(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short
|
|
|
}
|
|
|
}
|
|
|
} else { /* ---- PAL ---- */
|
|
|
- /* We don't play around with FSCI in PAL mode */
|
|
|
- if(resindex == 0x04) {
|
|
|
- SiS_SetCH70xxANDOR(SiS_Pr,0x20,0x00,0xEF); /* loop filter off */
|
|
|
- SiS_SetCH70xxANDOR(SiS_Pr,0x21,0x01,0xFE); /* ACIV on */
|
|
|
- } else {
|
|
|
- SiS_SetCH70xxANDOR(SiS_Pr,0x20,0x00,0xEF); /* loop filter off */
|
|
|
- SiS_SetCH70xxANDOR(SiS_Pr,0x21,0x01,0xFE); /* ACIV on */
|
|
|
- }
|
|
|
+ /* We don't play around with FSCI in PAL mode */
|
|
|
+ SiS_SetCH70xxANDOR(SiS_Pr, 0x20, 0x00, 0xEF); /* loop filter off */
|
|
|
+ SiS_SetCH70xxANDOR(SiS_Pr, 0x21, 0x01, 0xFE); /* ACIV on */
|
|
|
}
|
|
|
|
|
|
#endif /* 300 */
|
|
@@ -9657,8 +9650,6 @@ SetDelayComp(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
|
|
|
delay = 0x0a;
|
|
|
} else if(IS_SIS740) {
|
|
|
delay = 0x00;
|
|
|
- } else if(SiS_Pr->ChipType < SIS_330) {
|
|
|
- delay = 0x0c;
|
|
|
} else {
|
|
|
delay = 0x0c;
|
|
|
}
|