diff options
-rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index faa25b9218c2..872eea422080 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c | |||
@@ -2240,21 +2240,18 @@ static unsigned char XGI_GetLCDInfo(unsigned short ModeNo, | |||
2240 | 2240 | ||
2241 | tempax = pVBInfo->LCDCapList[LCDIdIndex].LCD_Capability; | 2241 | tempax = pVBInfo->LCDCapList[LCDIdIndex].LCD_Capability; |
2242 | 2242 | ||
2243 | if (pVBInfo->IF_DEF_LVDS == 0) { /* shampoo */ | 2243 | if (((pVBInfo->VBType & VB_SIS302LV) || |
2244 | if (((pVBInfo->VBType & VB_SIS302LV) || (pVBInfo->VBType | 2244 | (pVBInfo->VBType & VB_XGI301C)) && (tempax & XGI_LCDDualLink)) |
2245 | & VB_XGI301C)) && (tempax & XGI_LCDDualLink)) { | 2245 | tempbx |= SetLCDDualLink; |
2246 | tempbx |= SetLCDDualLink; | 2246 | |
2247 | } | 2247 | if ((pVBInfo->LCDResInfo == Panel_1400x1050) && |
2248 | 2248 | (pVBInfo->VBInfo & SetCRT2ToLCD) && (resinfo == 9) && | |
2249 | if ((pVBInfo->LCDResInfo == Panel_1400x1050) && (pVBInfo->VBInfo | 2249 | (!(tempbx & EnableScalingLCD))) |
2250 | & SetCRT2ToLCD) && (resinfo == 9) && | 2250 | /* |
2251 | (!(tempbx & EnableScalingLCD))) | 2251 | * set to center in 1280x1024 LCDB |
2252 | /* | 2252 | * for Panel_1400x1050 |
2253 | * set to center in 1280x1024 LCDB | 2253 | */ |
2254 | * for Panel_1400x1050 | 2254 | tempbx |= SetLCDtoNonExpanding; |
2255 | */ | ||
2256 | tempbx |= SetLCDtoNonExpanding; | ||
2257 | } | ||
2258 | 2255 | ||
2259 | if (pVBInfo->VBInfo & SetInSlaveMode) { | 2256 | if (pVBInfo->VBInfo & SetInSlaveMode) { |
2260 | if (pVBInfo->VBInfo & SetNotSimuMode) | 2257 | if (pVBInfo->VBInfo & SetNotSimuMode) |