From 7930e4b5f4c3428c19488510933175eb6212a894 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 27 Apr 2007 10:22:51 -0700 Subject: [PATCH] Remove structure fields IsCustom and IsCustomCRT2 Since commit 5aa3427c0ee14939a9bedb0edde8784130f0b646 these fields can only be set to FALSE. Remove the fields and some associated code. --- src/init.c | 36 +++++------------------------------- src/init.h | 9 +++++---- src/xgi.h | 2 -- src/xgi_driver.c | 15 ++++----------- src/xgi_driver.h | 7 ++++--- 5 files changed, 18 insertions(+), 51 deletions(-) diff --git a/src/init.c b/src/init.c index 85300ed..d5f116a 100644 --- a/src/init.c +++ b/src/init.c @@ -1339,7 +1339,8 @@ XGISetMode(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo,USHORT ModeNo) #ifdef LINUX_XF86 BOOLEAN -XGIBIOSSetMode(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, ScrnInfoPtr pScrn, DisplayModePtr mode, BOOLEAN IsCustom, BOOLEAN dosetpitch) +XGIBIOSSetMode(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, + ScrnInfoPtr pScrn, DisplayModePtr mode, BOOLEAN dosetpitch) { XGIPtr pXGI = XGIPTR(pScrn); UShort ModeNo=0; @@ -1351,21 +1352,6 @@ XGIBIOSSetMode(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, ScrnInfoPtr pScr XGI_Pr->UseCustomMode = FALSE; - if((IsCustom) && (XGI_CheckBuildCustomMode(pScrn, mode, pXGI->VBFlags))) - { - - xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3, "Setting custom mode %dx%d\n", - XGI_Pr->CHDisplay, - (mode->Flags & V_INTERLACE ? XGI_Pr->CVDisplay * 2 : - (mode->Flags & V_DBLSCAN ? XGI_Pr->CVDisplay / 2 : - XGI_Pr->CVDisplay))); - - return(XGISetMode(XGI_Pr, HwInfo, pScrn, ModeNo, TRUE)); - - return(XGISetModeNew( HwInfo, ModeNo)); - - } - ModeNo = XGI_CalcModeIndex(pScrn, mode, pXGI->VBFlags); if(!ModeNo) return FALSE; @@ -1452,8 +1438,8 @@ XGIBIOSSetMode(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, ScrnInfoPtr pScr /*********************************************/ BOOLEAN -XGIBIOSSetModeCRT1(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, ScrnInfoPtr pScrn, - DisplayModePtr mode, BOOLEAN IsCustom) +XGIBIOSSetModeCRT1(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, + ScrnInfoPtr pScrn, DisplayModePtr mode) { XGIPtr pXGI = XGIPTR(pScrn); XGIIOADDRESS BaseAddr = HwInfo->pjIOAddress; @@ -1467,19 +1453,7 @@ XGIBIOSSetModeCRT1(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, ScrnInfoPtr XGI_Pr->UseCustomMode = FALSE; - if((IsCustom) && (XGI_CheckBuildCustomMode(pScrn, mode, pXGI->VBFlags))) { - - USHORT temptemp = XGI_Pr->CVDisplay; - - if(XGI_Pr->CModeFlag & DoubleScanMode) temptemp >>= 1; - else if(XGI_Pr->CInfoFlag & InterlaceMode) temptemp <<= 1; - - xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3, - "Setting custom mode %dx%d on CRT1\n", - XGI_Pr->CHDisplay, temptemp); - ModeNo = 0xfe; - - } else { + { ModeNo = XGI_CalcModeIndex(pScrn, mode, pXGI->VBFlags); if(!ModeNo) return FALSE; diff --git a/src/init.h b/src/init.h index 5b8fb3d..3537a04 100644 --- a/src/init.h +++ b/src/init.h @@ -175,11 +175,12 @@ USHORT XGI_New_GetOffset(XGI_Private *XGI_Pr,USHORT ModeNo,USHORT ModeIdIndex, void XGI_New_LoadDAC(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, USHORT ModeNo, USHORT ModeIdIndex); #ifdef LINUX_XF86 BOOLEAN XGISetMode(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo,ScrnInfoPtr pScrn,USHORT ModeNo, BOOLEAN dosetpitch); -BOOLEAN XGIBIOSSetMode(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, ScrnInfoPtr pScrn, - DisplayModePtr mode, BOOLEAN IsCustom, BOOLEAN dosetpitch); -BOOLEAN XGIBIOSSetModeCRT1(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, ScrnInfoPtr pScrn, - DisplayModePtr mode, BOOLEAN IsCustom); +BOOLEAN XGIBIOSSetMode(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, + ScrnInfoPtr pScrn, DisplayModePtr mode, BOOLEAN dosetpitch); + +BOOLEAN XGIBIOSSetModeCRT1(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, + ScrnInfoPtr pScrn, DisplayModePtr mode); USHORT XGI_CheckBuildCustomMode(ScrnInfoPtr pScrn, DisplayModePtr mode, int VBFlags); diff --git a/src/xgi.h b/src/xgi.h index 75a72ec..3d8b090 100644 --- a/src/xgi.h +++ b/src/xgi.h @@ -705,7 +705,6 @@ typedef struct { unsigned long ForceYPbPrType, ForceYPbPrAR; unsigned long lockcalls; /* Count unlock calls for debug */ - BOOLEAN IsCustom; Atom xvBrightness, xvContrast, xvColorKey, xvHue, xvSaturation; Atom xvAutopaintColorKey, xvSetDefaults, xvSwitchCRT; Atom xvDisableGfx, xvDisableGfxLR, xvTVXPosition, xvTVYPosition; @@ -752,7 +751,6 @@ typedef struct { int CRT1frameX1; int CRT1frameY1; Bool CheckForCRT2; - Bool IsCustomCRT2; int MergedFBXDPI, MergedFBYDPI; #ifdef XGIXINERAMA Bool UsexgiXinerama; diff --git a/src/xgi_driver.c b/src/xgi_driver.c index 0419ff2..a69929f 100644 --- a/src/xgi_driver.c +++ b/src/xgi_driver.c @@ -3945,7 +3945,7 @@ XGIModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) /* Head 2 (slave) is always CRT1 */ XGIPreSetMode(pScrn, mode, XGI_MODE_CRT1); if (!XGIBIOSSetModeCRT1(pXGI->XGI_Pr, &pXGI->xgi_HwDevExt, pScrn, - mode, pXGI->IsCustom)) { + mode)) { XGIErrorLog(pScrn, "XGIBIOSSetModeCRT1() failed\n"); return FALSE; } @@ -4009,7 +4009,7 @@ XGIModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) PDEBUG(ErrorF(" *** Start SetMode() \n")); if (!XGIBIOSSetMode(pXGI->XGI_Pr, &pXGI->xgi_HwDevExt, pScrn, - mode, pXGI->IsCustom, TRUE)) { + mode, TRUE)) { XGIErrorLog(pScrn, "XGIBIOSSetModeCRT() failed\n"); return FALSE; } @@ -5256,10 +5256,6 @@ XGIPreSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode, int viewmode) vbflag = pXGI->VBFlags; PDEBUG(ErrorF("VBFlags=0x%lx\n", pXGI->VBFlags)); - pXGI->IsCustom = FALSE; -#ifdef XGIMERGED - pXGI->IsCustomCRT2 = FALSE; -#endif #ifdef UNLOCK_ALWAYS xgiSaveUnlockExtRegisterLock(pXGI, NULL, NULL); /* Unlock Registers */ @@ -5415,8 +5411,7 @@ XGIPreSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode, int viewmode) CR31 |= 0x40; /* Set Drivermode */ CR31 &= ~0x06; /* Disable SlaveMode, disable SimuMode in SlaveMode */ - crt1rateindex = (!pXGI->IsCustom) - ? XGISearchCRT1Rate(pScrn, mymode) : CR33; + crt1rateindex = XGISearchCRT1Rate(pScrn, mymode); #ifdef XGIDUALHEAD if (pXGI->DualHeadMode) { @@ -5444,9 +5439,7 @@ XGIPreSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode, int viewmode) CR33 |= (crt1rateindex & 0x0f); } if (vbflag & CRT2_VGA) { - if (!pXGI->IsCustomCRT2) { - CR33 |= (XGISearchCRT1Rate(pScrn, mymode2) << 4); - } + CR33 |= (XGISearchCRT1Rate(pScrn, mymode2) << 4); } } else diff --git a/src/xgi_driver.h b/src/xgi_driver.h index aec71f0..4ebe14d 100644 --- a/src/xgi_driver.h +++ b/src/xgi_driver.h @@ -730,11 +730,12 @@ static void XGIDumpModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode); #endif extern BOOLEAN XGIBIOSSetMode(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExtension, - ScrnInfoPtr pScrn, DisplayModePtr mode, BOOLEAN IsCustom, BOOLEAN dosetpitch); + ScrnInfoPtr pScrn, DisplayModePtr mode, BOOLEAN dosetpitch); extern BOOLEAN XGISetMode(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExtension, ScrnInfoPtr pScrn,USHORT ModeNo, BOOLEAN dosetpitch); extern void XGIRegInit(XGI_Private *XGI_Pr, USHORT BaseAddr); extern void XGI_New_GetVBType(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO); -extern BOOLEAN XGIBIOSSetModeCRT1(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExtension, - ScrnInfoPtr pScrn, DisplayModePtr mode, BOOLEAN IsCustom); +extern BOOLEAN XGIBIOSSetModeCRT1(XGI_Private *XGI_Pr, + PXGI_HW_DEVICE_INFO HwDeviceExtension, ScrnInfoPtr pScrn, + DisplayModePtr mode);