mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
staging: xgifb: vb_setmode: delete IF_DEF_CRT2Monitor checks
Code checking for IF_DEF_CRT2Monitor is only executed for chips < XG20, and there IF_DEF_CRT2Monitor is always true, so the flag is redundant. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
aee0ac92f4
commit
ee76875ea5
1 changed files with 5 additions and 14 deletions
|
@ -1997,15 +1997,10 @@ static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
|
|||
/* shampoo add */
|
||||
/* for driver abnormal */
|
||||
if (!(tempbx & (SwitchCRT2 | SetSimuScanMode))) {
|
||||
if (pVBInfo->IF_DEF_CRT2Monitor == 1) {
|
||||
if (tempbx & SetCRT2ToRAMDAC) {
|
||||
tempbx &= (0xFF00 | SetCRT2ToRAMDAC |
|
||||
SwitchCRT2 | SetSimuScanMode);
|
||||
tempbx &= (0x00FF | (~SetCRT2ToYPbPr525750));
|
||||
}
|
||||
} else {
|
||||
tempbx &= (~(SetCRT2ToRAMDAC | SetCRT2ToLCD |
|
||||
SetCRT2ToTV));
|
||||
if (tempbx & SetCRT2ToRAMDAC) {
|
||||
tempbx &= (0xFF00 | SetCRT2ToRAMDAC |
|
||||
SwitchCRT2 | SetSimuScanMode);
|
||||
tempbx &= (0x00FF | (~SetCRT2ToYPbPr525750));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -5550,12 +5545,8 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info,
|
|||
struct vb_device_info *pVBInfo = &VBINF;
|
||||
pVBInfo->IF_DEF_LVDS = 0;
|
||||
|
||||
if (HwDeviceExtension->jChipType >= XG20) {
|
||||
pVBInfo->IF_DEF_CRT2Monitor = 0;
|
||||
if (HwDeviceExtension->jChipType >= XG20)
|
||||
pVBInfo->VBType = 0; /*set VBType default 0*/
|
||||
} else {
|
||||
pVBInfo->IF_DEF_CRT2Monitor = 1;
|
||||
}
|
||||
|
||||
XGIRegInit(pVBInfo, xgifb_info->vga_base);
|
||||
|
||||
|
|
Loading…
Reference in a new issue