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/g80_driver.c | |
| parent | 957b8c1a240884b26ee5b91856c251622cc0b2a7 (diff) | |
nv: update for resources/RAC API removal
Diffstat (limited to 'src/g80_driver.c')
| -rw-r--r-- | src/g80_driver.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/g80_driver.c b/src/g80_driver.c index 7e06358..17c85f0 100644 --- a/src/g80_driver.c +++ b/src/g80_driver.c @@ -29,8 +29,9 @@ #include <string.h> #include <xf86_OSproc.h> +#ifndef XSERVER_LIBPCIACCESS #include <xf86Resources.h> -#include <xf86RandR12.h> +#endif #include <mipointer.h> #include <mibstore.h> #include <micmap.h> @@ -43,6 +44,7 @@ #include <X11/extensions/dpms.h> #endif +#include <xf86RandR12.h> #include "nv_const.h" #include "g80_type.h" @@ -229,8 +231,10 @@ G80PreInit(ScrnInfoPtr pScrn, int flags) } /* Disable VGA access */ +#ifndef XSERVER_LIBPCIACCESS xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr); +#endif pScrn->monitor = pScrn->confScreen->monitor; @@ -314,11 +318,13 @@ G80PreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "MMIO registers mapped at %p\n", (void*)pNv->reg); +#ifndef XSERVER_LIBPCIACCESS if(xf86RegisterResources(pEnt->index, NULL, ResExclusive)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "xf86RegisterResources() found " "resource conflicts\n"); goto fail; } +#endif pNv->architecture = pNv->reg[0] >> 20 & 0x1ff; tmp = pNv->reg[0x0010020C/4]; |