XLibre/xf86-video-xgi
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-xgi.git synced 2026-03-24 01:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant "dosetpitch" parameter to XGIBIOSSetMode.

Browse Source
This commit is contained in:
Ian Romanick
2007-04-27 11:10:55 -07:00
parent 300c2d9b11
commit 6ee9100a6e
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/init.c
View File

@@ -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 )); */

2
src/init.h
View File

@@ -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);

3
src/xgi_driver.c
View File

@@ -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;
}

8
src/xgi_driver.h
View File

@@ -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);