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

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

staging: xgifb: vb_setmode: delete IF_DEF_YPbPr checks 



Code checking for IF_DEF_YPbPr is only executed for chips < XG20, and
there IF_DEF_YPbPr 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 2351d1fd

drivers/staging/xgifb/vb_setmode.c

+26 −41
Original line number Diff line number Diff line
@@ -1960,13 +1960,11 @@ static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, 
		}

	}



	if (pVBInfo->IF_DEF_YPbPr == 1) {

	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 = xgifb_reg_get(pVBInfo->P3d4, 0x35);

				temp &= YPbPrMode;

				tempbx |= SetCRT2ToHiVision;
@@ -1977,20 +1975,13 @@ static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, 
			}

		}

	}

	}



	tempax = push; /* restore CR31 */



	if (pVBInfo->IF_DEF_YPbPr == 1) {

	if (pVBInfo->IF_DEF_HiVision == 1)

		temp = 0x09FC;

	else

		temp = 0x097C;

	} else if (pVBInfo->IF_DEF_HiVision == 1) {

		temp = 0x01FC;

	} else {

		temp = 0x017C;

	}



	if (!(tempbx & temp)) {

		tempax |= DisableCRT2Display;
@@ -2037,10 +2028,8 @@ static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, 
		tempbx &= (0x00FF | (~SetCRT2ToYPbPr525750));

	}



	if (pVBInfo->IF_DEF_YPbPr == 1) {

	if (tempbx & SetCRT2ToYPbPr525750)

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

	}



	if (pVBInfo->IF_DEF_HiVision == 1) {

		if (tempbx & SetCRT2ToHiVision)
@@ -2097,7 +2086,6 @@ static void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex, 
		if (pVBInfo->VBInfo & SetCRT2ToSCART)

			tempbx |= TVSetPAL;



		if (pVBInfo->IF_DEF_YPbPr == 1) {

		if (pVBInfo->VBInfo & SetCRT2ToYPbPr525750) {

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

			index1 &= YPbPrMode;
@@ -2110,7 +2098,6 @@ static void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex, 
			if (index1 == YPbPrMode750p)

				tempbx = tempbx | TVSetYPbPr750p;

		}

		}



		if (pVBInfo->IF_DEF_HiVision == 1) {

			if (pVBInfo->VBInfo & SetCRT2ToHiVision)
@@ -5573,12 +5560,10 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info, 
	pVBInfo->IF_DEF_LVDS = 0;



	if (HwDeviceExtension->jChipType >= XG20) {

		pVBInfo->IF_DEF_YPbPr = 0;

		pVBInfo->IF_DEF_HiVision = 0;

		pVBInfo->IF_DEF_CRT2Monitor = 0;

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

	} else {

		pVBInfo->IF_DEF_YPbPr = 1;

		pVBInfo->IF_DEF_HiVision = 1;

		pVBInfo->IF_DEF_CRT2Monitor = 1;

	}