diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:36 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:36 +1000 |
| commit | 664d41155a5f60fa8ccf9c00d819d71d7fe0a238 (patch) | |
| tree | 27bf2c52a10c97d97e7fdb2103f64bed7557dd57 | |
| parent | c688ce43f935af22c23d58c692ffa501b88d9070 (diff) | |
s3virge: update for resources/RAC API removal
| -rw-r--r-- | src/s3v_driver.c | 7 | ||||
| -rw-r--r-- | src/s3v_shadow.c | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/s3v_driver.c b/src/s3v_driver.c index df5ea9b..849f9f2 100644 --- a/src/s3v_driver.c +++ b/src/s3v_driver.c @@ -29,9 +29,12 @@ in this Software without prior written authorization from the XFree86 Project. #endif #include <unistd.h> + +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" /* Needed by Resources Access Control (RAC) */ #include "xf86RAC.h" +#endif #include "xf86DDC.h" #include "vbe.h" @@ -791,11 +794,13 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags) pEnt = xf86GetEntityInfo(pScrn->entityList[0]); +#ifndef XSERVER_LIBPCIACCESS if (pEnt->resources) { xfree(pEnt); S3VFreeRec(pScrn); return FALSE; } +#endif #if USE_INT10 if (xf86LoadSubModule(pScrn, "int10")) { @@ -812,9 +817,11 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags) } ps3v->PciInfo = xf86GetPciInfoForEntity(pEnt->index); +#ifndef XSERVER_LIBPCIACCESS xf86RegisterResources(pEnt->index,NULL,ResNone); xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr); +#endif /* * Set the Chipset and ChipRev, allowing config file entries to diff --git a/src/s3v_shadow.c b/src/s3v_shadow.c index f61773a..e2e1269 100644 --- a/src/s3v_shadow.c +++ b/src/s3v_shadow.c @@ -60,7 +60,6 @@ in this Software without prior written authorization from the XFree86 Project. #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "xf86PciInfo.h" #include "xf86Pci.h" #include "shadowfb.h" |