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

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

staging: xgifb: delete IF_DEF_ScaleLCD 



Delete one more disabled feature.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3d6defad

drivers/staging/xgifb/vb_setmode.c

+24 −43
Original line number Diff line number Diff line
@@ -2490,9 +2490,6 @@ static void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex, 


	index = index & IndexMask;



	if ((pVBInfo->IF_DEF_ScaleLCD == 0) ||

	    ((pVBInfo->IF_DEF_ScaleLCD == 1) &&

	    (!(pVBInfo->LCDInfo & EnableScalingLCD)))) {

	tempbx = 0;



	if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
@@ -2524,7 +2521,6 @@ static void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex, 


	XGI_SetCRT1Timing_V(ModeIdIndex, ModeNo, pVBInfo);

}

}



static unsigned short XGI_GetLCDCapPtr(struct vb_device_info *pVBInfo)

{
@@ -2660,12 +2656,6 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex, 
		pVBInfo->VGAVDE = tempbx;

	}



	if ((pVBInfo->IF_DEF_ScaleLCD == 1) &&

	    (pVBInfo->LCDInfo & EnableScalingLCD)) {

		tempax = pVBInfo->HDE;

		tempbx = pVBInfo->VDE;

	}



	tempax = pVBInfo->HT;



	if (pVBInfo->LCDInfo & EnableScalingLCD)
@@ -2889,11 +2879,6 @@ static void XGI_GetLCDVCLKPtr(unsigned char *di_0, unsigned char *di_1, 
	unsigned short index;



	if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {

		if (pVBInfo->IF_DEF_ScaleLCD == 1) {

			if (pVBInfo->LCDInfo & EnableScalingLCD)

				return;

		}



		/* index = XGI_GetLCDCapPtr(pVBInfo); */

		index = XGI_GetLCDCapPtr1(pVBInfo);
@@ -3545,9 +3530,6 @@ unsigned char XGI_GetLCDInfo(unsigned short ModeNo, unsigned short ModeIdIndex, 


	temp &= (ScalingLCD | LCDNonExpanding | LCDSyncBit | SetPWDEnable);



	if ((pVBInfo->IF_DEF_ScaleLCD == 1) && (temp & LCDNonExpanding))

		temp &= ~EnableScalingLCD;



	tempbx |= temp;



	LCDIdIndex = XGI_GetLCDCapPtr1(pVBInfo);
@@ -7800,7 +7782,6 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension, 
	pVBInfo->BaseAddr = (unsigned long) HwDeviceExtension->pjIOAddress;

	pVBInfo->IF_DEF_LVDS = 0;

	pVBInfo->IF_DEF_LCDA = 1;

	pVBInfo->IF_DEF_ScaleLCD = 0;



	if (HwDeviceExtension->jChipType >= XG20) { /* kuku 2004/06/25 */

		pVBInfo->IF_DEF_YPbPr = 0;

drivers/staging/xgifb/vb_struct.h

+1 −2
Original line number Diff line number Diff line
@@ -289,8 +289,7 @@ struct vb_device_info { 
	/* ,IF_DEF_FSTN; add for dstn */

	unsigned short   IF_DEF_LVDS, IF_DEF_TRUMPION, IF_DEF_DSTN;

	unsigned short   IF_DEF_CRT2Monitor;

	unsigned short   IF_DEF_LCDA, IF_DEF_YPbPr,

			 IF_DEF_ScaleLCD;

	unsigned short   IF_DEF_LCDA, IF_DEF_YPbPr;

	unsigned short   IF_DEF_ExpLink;

	unsigned short   IF_DEF_HiVision;

	unsigned short   LCDResInfo, LCDTypeInfo, VBType;/*301b*/