xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 72992668ca96717bf69bcea95a5deeaf7c57e826
Author: Alex Deucher <alex at botchco.com>
Date:   Mon Jun 30 14:09:09 2008 -0400

    RS4xx: enable the DRI by default on all variants
    
    Some RS4xx chips had the DRI disabled by default.
    With the recent drm and ddx changes these chips have been
    reported to work now with the DRI.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index f18ad99..3de50c6 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2106,19 +2106,16 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
 
     if (info->Chipset == PCI_CHIP_RN50_515E ||
 	info->Chipset == PCI_CHIP_RN50_5969 ||
-	info->Chipset == PCI_CHIP_RC410_5A61 ||
-	info->Chipset == PCI_CHIP_RC410_5A62 ||
-	info->Chipset == PCI_CHIP_RS485_5975 ||
 	info->ChipFamily == CHIP_FAMILY_RS600 ||
 	info->ChipFamily >= CHIP_FAMILY_R600) {
 	if (xf86ReturnOptValBool(info->Options, OPTION_DRI, FALSE)) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		"Direct rendering for RN50/RC410/RS485/RS600/R600 forced on -- "
+		"Direct rendering for RN50/RS600/R600 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/RC410/R600\n");
+		"Direct rendering not officially supported on RN50/RS600/R600\n");
 	    return FALSE;
 	}
     }