evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: xgifb: vb_setmode: delete IF_DEF_HiVision checks

Browse source 
Code checking for IF_DEF_HiVision is only executed for chips < XG20,
and there IF_DEF_HiVision 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:
Aaro Koskinen 2013-05-29 23:59:15 +03:00 • committed by Greg Kroah-Hartman
parent a4ce0e7e6e
commit aee0ac92f4
1 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/staging/xgifb/vb_setmode.c
View file

@ -1962,26 +1962,21 @@ static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
if (pVBInfo->VBType & (VB_SIS301LV|VB_SIS302LV|VB_XGI301C)) { if (pVBInfo->VBType & (VB_SIS301LV|VB_SIS302LV|VB_XGI301C)) {
if (temp & SetYPbPr) { if (temp & SetYPbPr) {
if (pVBInfo->IF_DEF_HiVision == 1) { /* shampoo add for new scratch */
/* shampoo add for new scratch */ temp = xgifb_reg_get(pVBInfo->P3d4, 0x35);
temp = xgifb_reg_get(pVBInfo->P3d4, 0x35); temp &= YPbPrMode;
temp &= YPbPrMode; tempbx |= SetCRT2ToHiVision;
tempbx |= SetCRT2ToHiVision;
if (temp != YPbPrMode1080i) { if (temp != YPbPrMode1080i) {
tempbx &= (~SetCRT2ToHiVision); tempbx &= (~SetCRT2ToHiVision);
tempbx |= SetCRT2ToYPbPr525750; tempbx |= SetCRT2ToYPbPr525750;
}
} }
} }
} }
tempax = push; /* restore CR31 */ tempax = push; /* restore CR31 */
if (pVBInfo->IF_DEF_HiVision == 1) temp = 0x09FC;
temp = 0x09FC;
else
temp = 0x097C;
if (!(tempbx & temp)) { if (!(tempbx & temp)) {
tempax |= DisableCRT2Display; tempax |= DisableCRT2Display;
@ -2031,11 +2026,9 @@ static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
if (tempbx & SetCRT2ToYPbPr525750) if (tempbx & SetCRT2ToYPbPr525750)
tempbx &= (0xFF00 | SwitchCRT2 | SetSimuScanMode); tempbx &= (0xFF00 | SwitchCRT2 | SetSimuScanMode);
if (pVBInfo->IF_DEF_HiVision == 1) { if (tempbx & SetCRT2ToHiVision)
if (tempbx & SetCRT2ToHiVision) tempbx &= (0xFF00 | SetCRT2ToHiVision | SwitchCRT2 |
tempbx &= (0xFF00 | SetCRT2ToHiVision | SwitchCRT2 | SetSimuScanMode);
SetSimuScanMode);
}
if (tempax & DisableCRT2Display) { /* Set Display Device Info */ if (tempax & DisableCRT2Display) { /* Set Display Device Info */
if (!(tempbx & (SwitchCRT2 | SetSimuScanMode))) if (!(tempbx & (SwitchCRT2 | SetSimuScanMode)))
@ -2099,10 +2092,8 @@ static void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
tempbx = tempbx | TVSetYPbPr750p; tempbx = tempbx | TVSetYPbPr750p;
} }
if (pVBInfo->IF_DEF_HiVision == 1) { if (pVBInfo->VBInfo & SetCRT2ToHiVision)
if (pVBInfo->VBInfo & SetCRT2ToHiVision) tempbx = tempbx | TVSetHiVision | TVSetPAL;
tempbx = tempbx | TVSetHiVision | TVSetPAL;
}
if ((pVBInfo->VBInfo & SetInSlaveMode) && if ((pVBInfo->VBInfo & SetInSlaveMode) &&
(!(pVBInfo->VBInfo & SetNotSimuMode))) (!(pVBInfo->VBInfo & SetNotSimuMode)))
@ -5560,11 +5551,9 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info,
pVBInfo->IF_DEF_LVDS = 0; pVBInfo->IF_DEF_LVDS = 0;
if (HwDeviceExtension->jChipType >= XG20) { if (HwDeviceExtension->jChipType >= XG20) {
pVBInfo->IF_DEF_HiVision = 0;
pVBInfo->IF_DEF_CRT2Monitor = 0; pVBInfo->IF_DEF_CRT2Monitor = 0;
pVBInfo->VBType = 0; /*set VBType default 0*/ pVBInfo->VBType = 0; /*set VBType default 0*/
} else { } else {
pVBInfo->IF_DEF_HiVision = 1;
pVBInfo->IF_DEF_CRT2Monitor = 1; pVBInfo->IF_DEF_CRT2Monitor = 1;
} }