From cf3f95d2164604047866b283fe0071574bf16dbc Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 10 Jun 2004 08:37:28 +0000 Subject: [PATCH] Oops, testers reported that the last patch actually didn't work (conflicts occurred), so the R300 PDMA doesn't work. Disable. --- hw/kdrive/ati/ati_dma.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/kdrive/ati/ati_dma.c b/hw/kdrive/ati/ati_dma.c index cbfd58b95..2df8125e4 100644 --- a/hw/kdrive/ati/ati_dma.c +++ b/hw/kdrive/ati/ati_dma.c @@ -752,6 +752,9 @@ ATIPseudoDMAInit(ScreenPtr pScreen) ATICardInfo(pScreenPriv); char *mmio = atic->reg_base; + if (atic->is_r200 || atic->is_r300) + return FALSE; + ATIUploadMicrocode(atis); ATIEngineReset(atis);