diff options
| author | Chris Ball <cjb@laptop.org> | 2010-06-25 13:28:45 -0400 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2010-06-26 20:52:43 -0400 |
| commit | d8af97e26032ab40c70ce35da448fd52ca14203e (patch) | |
| tree | 038b4ca90d19f19c37a75ecb3eba2ef2ef2e3e3d | |
| parent | 9f688a692e4f094ad2e31a5f5899e321d0cb5fbb (diff) | |
xgi: Compile fix: XSERVER_LIBPCIACCESS guards
| -rwxr-xr-x | src/xgi_driver.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/xgi_driver.c b/src/xgi_driver.c index 5d75647..b4f83b8 100755 --- a/src/xgi_driver.c +++ b/src/xgi_driver.c @@ -2769,7 +2769,11 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3, "VGA memory map from 0x%x to 0x%x \n", +#ifdef XSERVER_LIBPCIACCESS + pXGI->PciInfo->regions[2].base_addr, VGAHWPTR(pScrn)->Base); +#else pXGI->PciInfo->ioBase[2], VGAHWPTR(pScrn)->Base); +#endif } } vgaHWGetIOBase(VGAHWPTR(pScrn)); @@ -2804,12 +2808,14 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) #endif /* !defined(__alpha__) */ } +#ifndef XSERVER_LIBPCIACCESS xf86SetOperatingState(resVgaMem, pXGI->pEnt->index, ResUnusedOpr); /* Operations for which memory access is required */ pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; /* Operations for which I/O access is required */ pScrn->racIoFlags = RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; +#endif /* The ramdac module should be loaded here when needed */ if (!xf86LoadSubModule(pScrn, "ramdac")) { @@ -3289,6 +3295,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) (unsigned long) pXGI->IOAddress, pXGI->mmioSize); pXGI->xgi_HwDevExt.bIntegratedMMEnabled = TRUE; +#ifndef XSERVER_LIBPCIACCESS /* Register the PCI-assigned resources. */ if (xf86RegisterResources(pXGI->pEnt->index, NULL, ResExclusive)) { XGIErrorLog(pScrn, @@ -3303,6 +3310,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) XGIFreeRec(pScrn); return FALSE; } +#endif from = X_PROBED; if (pXGI->pEnt->device->videoRam != 0) { |