1116N/A[Backported to xf86-video-ati 6.8.0]

1116N/A

1116N/AFrom 21a621c297ac71c65c239ea960c38706e718b91c Mon Sep 17 00:00:00 2001

1116N/AFrom: Dave Airlie <airlied@redhat.com>

1116N/ADate: Tue, 28 Jul 2009 13:32:28 +1000

1116N/ASubject: [PATCH] ati: update for resources/RAC API removal

1116N/A

1116N/A---

1116N/A src/radeon_driver.c | 6 +++++-

1116N/A src/radeon_probe.c | 3 +++

1116N/A 2 files changed, 8 insertions(+), 1 deletions(-)

1116N/A

1116N/Adiff --git a/src/radeon_driver.c b/src/radeon_driver.c

1116N/Aindex 9c5fce6..25d912d 100644

1116N/A--- a/src/radeon_driver.c

1116N/A+++ b/src/radeon_driver.c

1116N/A@@ -92,9 +92,11 @@

1116N/A /* X and server generic header files */

1116N/A #include "xf86.h"

1116N/A #include "xf86_OSproc.h"

1116N/A-#include "xf86RAC.h"

1116N/A #include "xf86RandR12.h"

1116N/A+#ifndef XSERVER_LIBPCIACCESS

1116N/A+#include "xf86RAC.h"

1116N/A #include "xf86Resources.h"

1116N/A+#endif

1116N/A #include "xf86cmap.h"

1116N/A #include "vbe.h"

1116N/A

1116N/A@@ -2633,6 +2635,7 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)

1116N/A PCI_DEV_DEV(info->PciInfo),

1116N/A PCI_DEV_FUNC(info->PciInfo));

1116N/A

1116N/A+#ifndef XSERVER_LIBPCIACCESS

1116N/A if (xf86RegisterResources(info->pEnt->index, 0, ResExclusive))

1116N/A goto fail;

1116N/A

1116N/A@@ -2640,6 +2643,7 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)

1116N/A goto fail;

1116N/A

1116N/A pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR;

1116N/A+#endif

1116N/A pScrn->monitor = pScrn->confScreen->monitor;

1116N/A

1116N/A /* Allocate an xf86CrtcConfig */

1116N/Adiff --git a/src/radeon_probe.c b/src/radeon_probe.c

1116N/Aindex 4ec7485..36451f9 100644

1116N/A--- a/src/radeon_probe.c

1116N/A+++ b/src/radeon_probe.c

1116N/A@@ -46,12 +46,15 @@

1116N/A #include "xf86.h"

1116N/A #define _XF86MISC_SERVER_

1116N/A #include <X11/extensions/xf86misc.h>

1116N/A+#ifndef XSERVER_LIBPCIACCESS

1116N/A #include "xf86Resources.h"

1116N/A+#endif

1116N/A

1116N/A #include "radeon_chipset_gen.h"

1116N/A

1116N/A #include "radeon_pci_chipset_gen.h"

1116N/A

1116N/A+

1116N/A #ifdef XSERVER_LIBPCIACCESS

1116N/A #include "radeon_pci_device_match_gen.h"

1116N/A #endif