diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:28 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:28 +1000 |
| commit | a314fd6a6c98519967e47fc89d53e040c9842dba (patch) | |
| tree | 15bf5b0b38c2d99aba239bcb5d794859514c875e | |
| parent | d72f0faa2309cf411052f480e3da83af943eb7ac (diff) | |
ast: update for resources/RAC API removal
| -rw-r--r-- | src/ast_driver.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ast_driver.c b/src/ast_driver.c index ac78321..76da3f5 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -25,8 +25,10 @@ #endif #include "xf86.h" #include "xf86_OSproc.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" #include "xf86RAC.h" +#endif #include "xf86cmap.h" #include "compiler.h" #include "mibstore.h" @@ -347,8 +349,10 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags) if (pEnt->location.type != BUS_PCI) return FALSE; +#ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(pEnt->index, 0, ResExclusive)) return FALSE; +#endif /* The vgahw module should be loaded here when needed */ if (!xf86LoadSubModule(pScrn, "vgahw")) @@ -398,8 +402,10 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags) pScrn->progClock = TRUE; pScrn->rgbBits = 6; pScrn->monitor = pScrn->confScreen->monitor; /* should be initialized before set gamma */ +#ifndef XSERVER_LIBPCIACCESS pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; pScrn->racIoFlags = RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; +#endif /* * If the driver can do gamma correction, it should call xf86SetGamma() @@ -672,9 +678,11 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags) } #endif +#ifndef XSERVER_LIBPCIACCESS /* We won't be using the VGA access after the probe */ xf86SetOperatingState(resVgaIo, pAST->pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pAST->pEnt->index, ResDisableOpr); +#endif return TRUE; } |