xf86-video-ati: Branch 'master'

[Adam Jackson]

 src/radeon_driver.c |   13 +++++++++++++
 1 files changed, 13 insertions(+)

New commits:
diff-tree dfa47b09b5b8d7eeaa3f8ae629ebb3c7efb51511 (from 1dcd9b1f75ba2307beb42556aa7f2f945171d5fb)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Thu Aug 24 19:50:46 2006 -0400

    Disable DRI on xpress 200{,m} since we know it's broken.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 9701967..7155e42 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -4475,6 +4475,19 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr
 	return FALSE;
     }
 
+    if (info->Chipset == PCI_CHIP_RS400_5A41 ||
+	info->Chipset == PCI_CHIP_RS400_5A42 ||
+	info->Chipset == PCI_CHIP_RC410_5A61 ||
+	info->Chipset == PCI_CHIP_RC410_5A62 ||
+	info->Chipset == PCI_CHIP_RS480_5954 ||
+	info->Chipset == PCI_CHIP_RS480_5955 ||
+	info->Chipset == PCI_CHIP_RS482_5974 ||
+	info->Chipset == PCI_CHIP_RS482_5975) {
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		   "Direct rendering broken on XPRESS 200 and 200M\n");
+	return FALSE;
+    }
+
     if (xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
 		   "[dri] Acceleration disabled, not initializing the DRI\n");