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

xgi: build against non-piooffset vgahw

Browse Source 
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie
2012-08-07 09:17:29 +10:00
parent 5cebdabdaa
commit be3abf8570
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/xgi_driver.c
View File

@@ -2573,7 +2573,9 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
pXGI->IODBase = pScrn->domainIOBase;
#endif
/* Get the entity, and make sure it is PCI. */
@@ -2639,6 +2641,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
}
vgaHWGetIOBase(VGAHWPTR(pScrn));
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
/* Jong@08262009; why not to modify ??? */
/* We "patch" the PIOOffset inside vgaHW in order to force
* the vgaHW module to use our relocated i/o ports.
@@ -2650,6 +2653,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
(pXGI->PciInfo->ioBase[2] & 0xFFFC)
#endif
;
#endif
pXGI->pInt = NULL;
if (!pXGI->Primary) {
@@ -4362,6 +4366,7 @@ XGIModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
return FALSE;
}
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
/* Reset our PIOOffset as vgaHWInit might have reset it */
VGAHWPTR(pScrn)->PIOOffset = pXGI->IODBase - 0x380 +
#ifdef XSERVER_LIBPCIACCESS
@@ -4370,6 +4375,7 @@ XGIModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
(pXGI->PciInfo->ioBase[2] & 0xFFFC)
#endif
;
#endif
/* Prepare the register contents */
if (!(*pXGI->ModeInit) (pScrn, mode)) {
@@ -4641,6 +4647,7 @@ XGIScreenInit(SCREEN_INIT_ARGS_DECL)
}
vgaHWGetIOBase(hwp);
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
/* Patch the PIOOffset inside vgaHW to use
* our relocated IO ports.
*/
@@ -4651,6 +4658,7 @@ XGIScreenInit(SCREEN_INIT_ARGS_DECL)
(pXGI->PciInfo->ioBase[2] & 0xFFFC)
#endif
;
#endif
/* Map the XGI memory and MMIO areas */
if (!XGIMapMem(pScrn)) {