xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_dri.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit ef69336584c45e35aabb797a06c4030e75d66507
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Mar 12 14:54:18 2009 +1000

    r600: fix sizing of PCI GART table for r600

diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 2b7540c..1bfb896 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -2327,8 +2327,11 @@ int RADEONDRIGetPciAperTableSize(ScrnInfoPtr pScrn)
     int num_pages;
 
     num_pages = (info->dri->pciAperSize * 1024 * 1024) / 4096;
-    
-    ret_size = num_pages * sizeof(unsigned int);
+
+    if (info->ChipFamily < CHIP_FAMILY_R600)
+        ret_size = num_pages * sizeof(unsigned int);
+    else
+        ret_size = num_pages * sizeof(uint64_t);
 
     return ret_size;
 }