xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_driver.c |   20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 4fc978f3d83ef6370c9715e7ca5350640ccbfe10
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Feb 26 12:10:08 2009 -0500

    R6xx/R7xx: use shadowfb if DRI is disabled

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 1171de4..62fa3aa 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1915,16 +1915,6 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
 					     info->Chipset != PCI_CHIP_RN50_5969);
 #endif
 
-#if 0
-    if (info->ChipFamily >= CHIP_FAMILY_R600) {
-        info->r600_shadow_fb = TRUE;
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                   "using shadow framebuffer\n");
-        if (!xf86LoadSubModule(pScrn, "shadow"))
-            return FALSE;
-    }
-#endif
-
     return TRUE;
 }
 
@@ -2166,7 +2156,15 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
 		"and may cause instability or lockups\n");
 	} else {
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		"Direct rendering not officially supported on RN50/RS600/R600\n");
+		"Direct rendering not officially supported on RN50/R600\n");
+
+	    if (info->ChipFamily >= CHIP_FAMILY_R600) {
+		info->r600_shadow_fb = TRUE;
+		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+			   "using shadow framebuffer\n");
+		if (!xf86LoadSubModule(pScrn, "shadow"))
+		    info->r600_shadow_fb = FALSE;
+	    }
 	    return FALSE;
 	}
     }