xserver/hw/kdrive/ati ati_dma.c,1.2,1.3

[Eric Anholt]

Committed by: anholt

Update of /cvs/xserver/xserver/hw/kdrive/ati
In directory pdx:/home/anholt/xserver/hw/kdrive/ati

Modified Files:
	ati_dma.c 
Log Message:
Oops, testers reported that the last patch actually didn't work
(conflicts occurred), so the R300 PDMA doesn't work.  Disable.


Index: ati_dma.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/ati/ati_dma.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/ati_dma.c	10 Jun 2004 05:57:31 -0000	1.2
+++ b/ati_dma.c	10 Jun 2004 08:37:28 -0000	1.3
@@ -752,6 +752,9 @@
 	ATICardInfo(pScreenPriv);
 	char *mmio = atic->reg_base;
 
+	if (atic->is_r200 || atic->is_r300)
+		return FALSE;
+
 	ATIUploadMicrocode(atis);
 	ATIEngineReset(atis);