diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:32 +1000 |
| commit | 445498d2cc977b8c4f22fca881c75637dc7b058a (patch) | |
| tree | 2eb98e3c3c2e920449c62dae7c5b2c242c9c8619 /src/nv_driver.c | |
| parent | 957b8c1a240884b26ee5b91856c251622cc0b2a7 (diff) | |
nv: update for resources/RAC API removal
Diffstat (limited to 'src/nv_driver.c')
| -rw-r--r-- | src/nv_driver.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c index 3a396e0..a7cf2dc 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -1264,8 +1264,10 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) #endif } +#ifndef XSERVER_LIBPCIACCESS xf86SetOperatingState(resVgaIo, pNv->pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pNv->pEnt->index, ResDisableOpr); +#endif /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; @@ -1642,6 +1644,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX\n", (unsigned long)pNv->IOAddress); +#ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(pNv->pEnt->index, NULL, ResExclusive)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "xf86RegisterResources() found resource conflicts\n"); @@ -1649,6 +1652,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) NVFreeRec(pScrn); return FALSE; } +#endif switch (pNv->Chipset & 0x0ff0) { case 0x0100: /* GeForce 256 */ |