xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit f356ca7795531e0c080775efb598141eb7db44ba
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Mar 12 03:42:40 2009 -0400

    RS600: fix page table size for rs600 as well

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