diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:28 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-09-10 12:59:07 +1000 |
| commit | 034b6d057cd62ce60961d4f7b3fa4e9eb35c9626 (patch) | |
| tree | f922abdb1a612658676ad8141b5d5588f5c82ed7 | |
| parent | b0de26fb70a21f03a66e192913a571dcf0ac616f (diff) | |
ati: update for resources/RAC API removal
(cherry picked from commit 21a621c297ac71c65c239ea960c38706e718b91c)
| -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 056ff295..94886669 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" @@ -2873,12 +2875,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 041bab67..234d2929 100644 --- a/src/radeon_probe.c +++ b/src/radeon_probe.c @@ -44,12 +44,15 @@ #include "atipcirename.h" #include "xf86.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +#endif #include "radeon_chipset_gen.h" #include "radeon_pci_chipset_gen.h" + #ifdef XSERVER_LIBPCIACCESS #include "radeon_pci_device_match_gen.h" #endif |