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

[Alex Deucher]

 src/radeon_driver.c |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 0db4b1708c2e5f3c14f48de186ee866ab8d9d5a9
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Oct 7 17:01:55 2009 -0400

    radeon: clamp the internal FB map to the aperture size
    
    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

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 800397c..4e0dcf9 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1362,6 +1362,15 @@ static void RADEONInitMemoryMap(ScrnInfoPtr pScrn)
     if (aper_size > mem_size)
 	mem_size = aper_size;
 
+    /* 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
+     * the internal top of gart calculation on some systems.
+     * See fdo bug 24301.
+     */
+    if (mem_size > aper_size)
+	mem_size = aper_size;
+
 #ifdef XF86DRI
     /* Apply memory map limitation if using an old DRI */
     if (info->directRenderingEnabled && !info->dri->newMemoryMap) {