xf86-video-ati: Branch '6.12-branch'

[Alex Deucher]

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

New commits:
commit ca9c619c9c085fac3bea486cfce1c8b5ba09cd52
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Oct 30 17:36:29 2009 -0400

    radeon: clamp the internal FB map to the aperture size v2
    
    We don't use the invisible memory yet and on cards with
    large amounts of vram this can cause the top of GART
    calculation to overflow.
    
    Fixes bug fdo bug 24301:
    http://bugs.freedesktop.org/show_bug.cgi?id=24301
    
    v2: only clamp cards with more than 512 MB. This seems
    to cause problems on some older cards due to the way the
    drm and ddx set up the internal memory map.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 4e0dcf9..c726f8f 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1364,11 +1364,14 @@ static void RADEONInitMemoryMap(ScrnInfoPtr pScrn)
 
     /* don't map the whole FB in the internal address space.
      * we don't currently use fb space larger than the aperture
-     * size and on cards with 1 GB of vram, this can overflow
+     * size and on cards with more than 512 MB of vram, this can overflow
      * the internal top of gart calculation on some systems.
+     * Limit it to cards with more than 512 MB as this causes problems
+     * on some other cards due to the way the ddx and drm set up the
+     * internal memory map.
      * See fdo bug 24301.
      */
-    if (mem_size > aper_size)
+    if (mem_size > 0x20000000)
 	mem_size = aper_size;
 
 #ifdef XF86DRI