xf86-video-ati: Branch 'master'

[Dave Airlie]

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

New commits:
diff-tree d808781d48adf01e80b5bb476bae2d2f599030f1 (from 4d9f944e40c6b9ac7e80428dff49c6e83fda1d8f)
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Sep 28 14:50:42 2007 +1000

    rc410: disable DRI by default due to it not working

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 89254d3..a8a3d39 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2026,15 +2026,17 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr
     info->pKernelDRMVersion = NULL;
 
     if (info->Chipset == PCI_CHIP_RN50_515E ||
-	info->Chipset == PCI_CHIP_RN50_5969) {
+	info->Chipset == PCI_CHIP_RN50_5969 ||
+	info->Chipset == PCI_CHIP_RC410_5A61 ||
+	info->Chipset == PCI_CHIP_RC410_5A62) {
     	if (xf86ReturnOptValBool(info->Options, OPTION_DRI, FALSE)) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		"Direct rendering for RN50 forced on -- "
+		"Direct rendering for RN50/RC410 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\n");
+		"Direct rendering not officially supported on RN50/RC410\n");
 	    return FALSE;
 	}
     }