xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_driver.c |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 758fcc33c232c32e7b66261fca51de161d1a4800
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Mar 10 10:34:13 2009 +1000

    r600: enable DRI by default
    
    fallback to shadowfb if DRI fails pre init

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index cbe5d59..e8d28f0 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2147,24 +2147,15 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
         return FALSE;
 
     if (info->Chipset == PCI_CHIP_RN50_515E ||
-	info->Chipset == PCI_CHIP_RN50_5969 ||
-	info->ChipFamily >= CHIP_FAMILY_R600) {
+	info->Chipset == PCI_CHIP_RN50_5969) {
 	if (xf86ReturnOptValBool(info->Options, OPTION_DRI, FALSE)) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		"Direct rendering for RN50/R600 forced on -- "
+		"Direct rendering for RN50 forced on -- "
 		"This is NOT officially supported at the hardware level "
 		"and may cause instability or lockups\n");
 	} else {
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		"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;
-	    }
+		"Direct rendering not officially supported on RN50\n");
 	    return FALSE;
 	}
     }
@@ -2896,6 +2887,16 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      */
     info->directRenderingEnabled = RADEONPreInitDRI(pScrn);
 #endif
+    if (!info->directRenderingEnabled) {
+	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;
+	}
+    }
+
     if (!RADEONPreInitVRAM(pScrn))
 	goto fail;