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

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

staging: xgifb: XGI_AjustCRT2Rate(): delete IF_DEF_LVDS check 



IF_DEF_LVDS cannot be set when XGI_AjustCRT2Rate() is called, so we can
remove the check and dead code.

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

drivers/staging/xgifb/vb_setmode.c

+34 −55
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeNo, 
	tempbx = XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID;

	tempax = 0;



	if (pVBInfo->IF_DEF_LVDS == 0) {

	if (pVBInfo->VBInfo & SetCRT2ToRAMDAC) {

		tempax |= SupportRAMDAC2;
@@ -206,22 +205,16 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeNo, 
		tempax |= SupportHiVision;

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

		    ((resinfo == 4) ||

			     (resinfo == 3 &&

			      (pVBInfo->SetFlag & TVSimuMode)) ||

		     (resinfo == 3 && (pVBInfo->SetFlag & TVSimuMode)) ||

		     (resinfo > 7)))

			return 0;

		} else if (pVBInfo->VBInfo & (SetCRT2ToAVIDEO |

					       SetCRT2ToSVIDEO |

					       SetCRT2ToSCART |

					       SetCRT2ToYPbPr525750 |

	} else if (pVBInfo->VBInfo & (SetCRT2ToAVIDEO | SetCRT2ToSVIDEO |

				      SetCRT2ToSCART | SetCRT2ToYPbPr525750 |

				      SetCRT2ToHiVision)) {

		tempax |= SupportTV;



			if (pVBInfo->VBType & (VB_SIS301B |

					       VB_SIS302B |

					       VB_SIS301LV |

					       VB_SIS302LV |

					       VB_XGI301C))

		if (pVBInfo->VBType & (VB_SIS301B | VB_SIS302B | VB_SIS301LV |

				       VB_SIS302LV | VB_XGI301C))

			tempax |= SupportTV1024;



		if (!(pVBInfo->VBInfo & TVSetPAL) &&
@@ -230,20 +223,6 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeNo, 
		    (!(pVBInfo->VBInfo & SetNotSimuMode)))

			return 0;

	}

	} else if (pVBInfo->VBInfo & SetCRT2ToLCD) { /* for LVDS */

		tempax |= SupportLCD;



		if (resinfo > 0x08)

			return 0; /* 1024x768 */



		if (pVBInfo->LCDResInfo < Panel_1024x768) {

			if (resinfo > 0x07)

				return 0; /* 800x600 */



			if (resinfo == 0x04)

				return 0; /* 512x384 */

		}

	}



	for (; XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID ==

	       tempbx; (*i)--) {