Commit a8b35290 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman

staging: xgifb: XGI_GetTVInfo(): delete IF_DEF_LVDS checks

This function is never called when pVBInfo->IF_DEF_LVDS is true, so we
can remove checks and reduce complexity.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1b149edf
...@@ -2137,10 +2137,8 @@ static void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex, ...@@ -2137,10 +2137,8 @@ static void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
TVSetNTSCJ | TVSetNTSCJ |
TVSetPAL); TVSetPAL);
if (pVBInfo->IF_DEF_LVDS == 0) { if (pVBInfo->VBInfo & SetCRT2ToSCART)
if (pVBInfo->VBInfo & SetCRT2ToSCART) tempbx |= TVSetPAL;
tempbx |= TVSetPAL;
}
if (pVBInfo->IF_DEF_YPbPr == 1) { if (pVBInfo->IF_DEF_YPbPr == 1) {
if (pVBInfo->VBInfo & SetCRT2ToYPbPr525750) { if (pVBInfo->VBInfo & SetCRT2ToYPbPr525750) {
...@@ -2162,33 +2160,26 @@ static void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex, ...@@ -2162,33 +2160,26 @@ static void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
tempbx = tempbx | TVSetHiVision | TVSetPAL; tempbx = tempbx | TVSetHiVision | TVSetPAL;
} }
if (pVBInfo->IF_DEF_LVDS == 0) { /* shampoo */ if ((pVBInfo->VBInfo & SetInSlaveMode) &&
if ((pVBInfo->VBInfo & SetInSlaveMode) && (!(pVBInfo->VBInfo & SetNotSimuMode)))
(!(pVBInfo->VBInfo & SetNotSimuMode))) tempbx |= TVSimuMode;
tempbx |= TVSimuMode;
if (!(tempbx & TVSetPAL) && if (!(tempbx & TVSetPAL) && (modeflag > 13) && (resinfo == 8))
(modeflag > 13) && /* NTSC 1024x768, */
(resinfo == 8)) /* NTSC 1024x768, */ tempbx |= NTSC1024x768;
tempbx |= NTSC1024x768;
tempbx |= RPLLDIV2XO; tempbx |= RPLLDIV2XO;
if (pVBInfo->VBInfo & SetCRT2ToHiVision) { if (pVBInfo->VBInfo & SetCRT2ToHiVision) {
if (pVBInfo->VBInfo & SetInSlaveMode) if (pVBInfo->VBInfo & SetInSlaveMode)
tempbx &= (~RPLLDIV2XO); tempbx &= (~RPLLDIV2XO);
} else if (tempbx & } else if (tempbx & (TVSetYPbPr525p | TVSetYPbPr750p)) {
(TVSetYPbPr525p | TVSetYPbPr750p)) { tempbx &= (~RPLLDIV2XO);
tempbx &= (~RPLLDIV2XO); } else if (!(pVBInfo->VBType & (VB_SIS301B | VB_SIS302B |
} else if (!(pVBInfo->VBType & VB_SIS301LV | VB_SIS302LV |
(VB_SIS301B | VB_XGI301C))) {
VB_SIS302B | if (tempbx & TVSimuMode)
VB_SIS301LV | tempbx &= (~RPLLDIV2XO);
VB_SIS302LV |
VB_XGI301C))) {
if (tempbx & TVSimuMode)
tempbx &= (~RPLLDIV2XO);
}
} }
} }
pVBInfo->TVInfo = tempbx; pVBInfo->TVInfo = tempbx;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment