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

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

staging: xgifb: SetFlag: delete GatingCRT 



This flag is never set, so checks can be removed and code behind it
deleted.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b750f516

drivers/staging/xgifb/vb_def.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#define SetCRT2ToDualEdge   0x8000



#define ReserveTVOption     0x0008

#define GatingCRT           0x0800

#define DisableChB          0x1000

#define EnableChB           0x2000

#define DisableChA          0x4000

drivers/staging/xgifb/vb_setmode.c

+3 −16
Original line number Diff line number Diff line
@@ -4283,12 +4283,6 @@ static void XGI_SetGroup5(unsigned short ModeNo, unsigned short ModeIdIndex, 
	return;

}



static void XGI_EnableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension,

		struct vb_device_info *pVBInfo)

{

	xgifb_reg_and_or(pVBInfo->P3d4, 0x63, 0xBF, 0x40);

}



static void XGI_DisableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension,

		struct vb_device_info *pVBInfo)

{
@@ -4623,11 +4617,8 @@ static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info, 


		if ((pVBInfo->SetFlag & DisableChA) || (pVBInfo->VBInfo

				& (DisableCRT2Display | XGI_SetCRT2ToLCDA

						| SetSimuScanMode))) {

			if (pVBInfo->SetFlag & GatingCRT)

				XGI_EnableGatingCRT(HwDeviceExtension, pVBInfo);

						| SetSimuScanMode)))

			XGI_DisplayOff(xgifb_info, HwDeviceExtension, pVBInfo);

		}



		if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) {

			if ((pVBInfo->SetFlag & DisableChA) || (pVBInfo->VBInfo
@@ -5572,12 +5563,8 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info, 
		xgifb_reg_or(pVBInfo->Part4Port, 0x1F, tempah);



		if (!(pVBInfo->SetFlag & DisableChA)) {

			if (!(pVBInfo->SetFlag & GatingCRT)) {

				XGI_DisableGatingCRT(HwDeviceExtension,

						     pVBInfo);

				XGI_DisplayOn(xgifb_info, HwDeviceExtension,

						pVBInfo);

			}

			XGI_DisableGatingCRT(HwDeviceExtension, pVBInfo);

			XGI_DisplayOn(xgifb_info, HwDeviceExtension, pVBInfo);

		}

	} /* 301 */

	else { /* LVDS */