xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon.h        |    2 ++
 src/radeon_driver.c |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 89452c08048c98fb5cc3dc551b3824be40d52cf2
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue Nov 8 11:23:11 2011 +0100

    UMS: Guard references to PCITAG / pciTag with XSERVER_LIBPCIACCESS (bug #42690)
    
    Should fix https://bugs.freedesktop.org/show_bug.cgi?id=42690 .
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/radeon.h b/src/radeon.h
index da95f8b..34f6f53 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -792,7 +792,9 @@ struct radeon_accel_state {
 typedef struct {
     EntityInfoPtr     pEnt;
     pciVideoPtr       PciInfo;
+#ifndef XSERVER_LIBPCIACCESS
     PCITAG            PciTag;
+#endif
     int               Chipset;
     RADEONChipFamily  ChipFamily;
     RADEONErrata      ChipErrata;
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 293897a..a9abd66 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3023,9 +3023,11 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
     }
 
     info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
     info->PciTag  = pciTag(PCI_DEV_BUS(info->PciInfo),
 			   PCI_DEV_DEV(info->PciInfo),
 			   PCI_DEV_FUNC(info->PciInfo));
+#endif
     info->MMIOAddr = PCI_REGION_BASE(info->PciInfo, 2, REGION_MEM) & ~0xffULL;
     info->MMIOSize = PCI_REGION_SIZE(info->PciInfo, 2);
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "TOTO SAYS %016llx\n",