diff --git a/src/init.c b/src/init.c index 6b0209b..51b78a2 100644 --- a/src/init.c +++ b/src/init.c @@ -1253,7 +1253,7 @@ 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 dosetpitch) + ScrnInfoPtr pScrn, DisplayModePtr mode) { XGIPtr pXGI = XGIPTR(pScrn); UShort ModeNo=0; @@ -1313,10 +1313,9 @@ XGIBIOSSetMode(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, } - #ifdef LINUX_XF86 if(pScrn) { /* SetPitch: Adapt to virtual size & position */ - if((ModeNo > 0x13) && (dosetpitch)) { + if (ModeNo > 0x13) { /* XGI_SetPitch(XGI_Pr, pScrn); */ XGI_SetReg(XGI_Pr->XGI_Part1Port, 0x2f, 1); //yilin for crt2pitch it shoude modify if not colone mode @@ -1329,7 +1328,7 @@ XGIBIOSSetMode(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, /* Backup/Set ModeNo in BIOS scratch area */ /* XGI_GetSetModeID(pScrn, ModeNo); */ } - #endif + /* XGI_SetReg(XGI_Pr->XGI_Part1Port,0x2F,1); //yilin test XGI_SetReg(XGI_Pr->XGI_Part1Port,0x03,0x41); XGI_SetReg(XGI_Pr->XGI_Part1Port,0x07,(0x00 & 0xFF)); @@ -1337,7 +1336,6 @@ XGIBIOSSetMode(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, XGI_SetRegANDOR(XGI_Pr->XGI_Part1Port,0x09,0xF0,(0x02)); */ - return SetModeRet ; /* return (XGISetModeNew( HwInfo, ModeNo )); */ diff --git a/src/init.h b/src/init.h index 7b9b95a..93d5ef6 100644 --- a/src/init.h +++ b/src/init.h @@ -177,7 +177,7 @@ void XGI_New_LoadDAC(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, USHORT Mod 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 dosetpitch); + ScrnInfoPtr pScrn, DisplayModePtr mode); BOOLEAN XGIBIOSSetModeCRT1(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo, ScrnInfoPtr pScrn, DisplayModePtr mode); diff --git a/src/xgi_driver.c b/src/xgi_driver.c index a19a7e7..5d9286c 100644 --- a/src/xgi_driver.c +++ b/src/xgi_driver.c @@ -4007,8 +4007,7 @@ XGIModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) /* PDEBUG(XGIDumpRegs(pScrn)) ; */ PDEBUG(ErrorF(" *** Start SetMode() \n")); - if (!XGIBIOSSetMode(pXGI->XGI_Pr, &pXGI->xgi_HwDevExt, pScrn, - mode, TRUE)) { + if (!XGIBIOSSetMode(pXGI->XGI_Pr, &pXGI->xgi_HwDevExt, pScrn, mode)) { XGIErrorLog(pScrn, "XGIBIOSSetModeCRT() failed\n"); return FALSE; } diff --git a/src/xgi_driver.h b/src/xgi_driver.h index 4ebe14d..467cf43 100644 --- a/src/xgi_driver.h +++ b/src/xgi_driver.h @@ -729,10 +729,10 @@ unsigned char XGI_GetSetBIOSScratch(ScrnInfoPtr pScrn, USHORT offset, unsigned 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 dosetpitch); -extern BOOLEAN XGISetMode(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExtension, - ScrnInfoPtr pScrn,USHORT ModeNo, BOOLEAN dosetpitch); +extern BOOLEAN XGIBIOSSetMode(XGI_Private *XGI_Pr, + PXGI_HW_DEVICE_INFO HwDeviceExtension, ScrnInfoPtr pScrn, + DisplayModePtr mode); + extern void XGIRegInit(XGI_Private *XGI_Pr, USHORT BaseAddr); extern void XGI_New_GetVBType(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO);