Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aee0ac92 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: xgifb: vb_setmode: delete IF_DEF_HiVision checks 



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: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a4ce0e7e

drivers/staging/xgifb/vb_setmode.c

+14 −25
Original line number Diff line number Diff line
@@ -1962,7 +1962,6 @@ static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, 


	if (pVBInfo->VBType & (VB_SIS301LV|VB_SIS302LV|VB_XGI301C)) {

		if (temp & SetYPbPr) {

			if (pVBInfo->IF_DEF_HiVision == 1) {

			/* shampoo add for new scratch */

			temp = xgifb_reg_get(pVBInfo->P3d4, 0x35);

			temp &= YPbPrMode;
@@ -1974,14 +1973,10 @@ static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, 
			}

		}

	}

	}



	tempax = push; /* restore CR31 */



	if (pVBInfo->IF_DEF_HiVision == 1)

	temp = 0x09FC;

	else

		temp = 0x097C;



	if (!(tempbx & temp)) {

		tempax |= DisableCRT2Display;
@@ -2031,11 +2026,9 @@ static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, 
	if (tempbx & SetCRT2ToYPbPr525750)

		tempbx &= (0xFF00 | SwitchCRT2 | SetSimuScanMode);



	if (pVBInfo->IF_DEF_HiVision == 1) {

	if (tempbx & SetCRT2ToHiVision)

		tempbx &= (0xFF00 | SetCRT2ToHiVision | SwitchCRT2 |

			   SetSimuScanMode);

	}



	if (tempax & DisableCRT2Display) { /* Set Display Device Info */

		if (!(tempbx & (SwitchCRT2 | SetSimuScanMode)))
@@ -2099,10 +2092,8 @@ static void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex, 
				tempbx = tempbx | TVSetYPbPr750p;

		}



		if (pVBInfo->IF_DEF_HiVision == 1) {

		if (pVBInfo->VBInfo & SetCRT2ToHiVision)

			tempbx = tempbx | TVSetHiVision | TVSetPAL;

		}



		if ((pVBInfo->VBInfo & SetInSlaveMode) &&

		    (!(pVBInfo->VBInfo & SetNotSimuMode)))
@@ -5560,11 +5551,9 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info, 
	pVBInfo->IF_DEF_LVDS = 0;



	if (HwDeviceExtension->jChipType >= XG20) {

		pVBInfo->IF_DEF_HiVision = 0;

		pVBInfo->IF_DEF_CRT2Monitor = 0;

		pVBInfo->VBType = 0; /*set VBType default 0*/

	} else {

		pVBInfo->IF_DEF_HiVision = 1;

		pVBInfo->IF_DEF_CRT2Monitor = 1;

	}