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:41:14 +1000 |
| commit | 21a621c297ac71c65c239ea960c38706e718b91c (patch) | |
| tree | 5349d0edefcf16f68eaf627de008c29205e4365b | |
| parent | 5ad2519c2a7c0df389b2cd7cf7151c7e4b7252a8 (diff) | |
ati: update for resources/RAC API removal
| -rw-r--r-- | src/radeon_driver.c | 6 | ||||
| -rw-r--r-- | src/radeon_probe.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index bf950294..46c6451b 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -92,9 +92,11 @@ /* X and server generic header files */ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86RAC.h" #include "xf86RandR12.h" +#ifndef XSERVER_LIBPCIACCESS +#include "xf86RAC.h" #include "xf86Resources.h" +#endif #include "xf86cmap.h" #include "vbe.h" @@ -2923,12 +2925,14 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) PCI_DEV_DEV(info->PciInfo), PCI_DEV_FUNC(info->PciInfo)); +#ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(info->pEnt->index, 0, ResExclusive)) goto fail; xf86SetOperatingState(resVga, info->pEnt->index, ResUnusedOpr); pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR; +#endif pScrn->monitor = pScrn->confScreen->monitor; /* Allocate an xf86CrtcConfig */ diff --git a/src/radeon_probe.c b/src/radeon_probe.c index 78dee855..d9f92fa1 100644 --- a/src/radeon_probe.c +++ b/src/radeon_probe.c @@ -45,7 +45,9 @@ #include "atipcirename.h" #include "xf86.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +#endif #ifdef XF86DRM_MODE #include "xf86drmMode.h" @@ -56,6 +58,7 @@ #include "radeon_pci_chipset_gen.h" + #ifdef XSERVER_LIBPCIACCESS #include "radeon_pci_device_match_gen.h" #endif |