xf86-video-ati: Branch 'master'

[Brice Goglin]

 src/radeon_dri.h    |    1 +
 src/radeon_driver.c |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 5b5441f8cc119db0d1e03dd35bd06015a26270dd
Author: Brice Goglin <bgoglin at debian.org>
Date:   Tue Jul 29 23:31:14 2008 +0200

    Increase default GART size to 32MB on >=R300

diff --git a/src/radeon_dri.h b/src/radeon_dri.h
index b1c5bbf..6e3ad62 100644
--- a/src/radeon_dri.h
+++ b/src/radeon_dri.h
@@ -40,6 +40,7 @@
 
 /* DRI Driver defaults */
 #define RADEON_DEFAULT_GART_SIZE      8 /* MB (must be 2^n and > 4MB) */
+#define R300_DEFAULT_GART_SIZE        32 /* MB (for R300 and above) */
 #define RADEON_DEFAULT_RING_SIZE      1 /* MB (must be page aligned) */
 #define RADEON_DEFAULT_BUFFER_SIZE    2 /* MB (must be page aligned) */
 #define RADEON_DEFAULT_GART_TEX_SIZE  1 /* MB (must be page aligned) */
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index d55b906..010f1b9 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2184,7 +2184,11 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
 	"Direct rendering experimental on RS400/Xpress 200 enabled\n");
     }
 
-    info->gartSize      = RADEON_DEFAULT_GART_SIZE;
+    if (info->ChipFamily >= CHIP_FAMILY_R300)
+	info->gartSize      = R300_DEFAULT_GART_SIZE;
+    else
+	info->gartSize      = RADEON_DEFAULT_GART_SIZE;
+
     info->ringSize      = RADEON_DEFAULT_RING_SIZE;
     info->bufSize       = RADEON_DEFAULT_BUFFER_SIZE;
     info->gartTexSize   = RADEON_DEFAULT_GART_TEX_SIZE;