From 4629f974734368bc354bbccaec80b72ec10a66a2 Mon Sep 17 00:00:00 2001 From: Felix Kuehling Date: Thu, 14 Apr 2005 14:47:21 +0000 Subject: User reports indicate that both command and vertex DMA on SuperSavages lock up the engine. Disabling DMA on SuperSavages until someone figures out how to make it work. --- src/savage_driver.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/savage_driver.c b/src/savage_driver.c index 977ebc3..ec545cc 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -1449,7 +1449,17 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) from = X_DEFAULT; } } - psav->CommandDMA = (psav->CommandDMA && !S3_SAVAGE3D_SERIES(psav->Chipset)); + if (psav->CommandDMA && S3_SAVAGE3D_SERIES(psav->Chipset)) { + xf86DrvMsg(pScrn->scrnIndex, from == X_CONFIG ? X_WARNING : X_INFO, + "Savage3D/MX/IX does not support command DMA.\n"); + psav->CommandDMA = FALSE; + } + if ((psav->CommandDMA || psav->VertexDMA) && + psav->Chipset == S3_SUPERSAVAGE) { + xf86DrvMsg(pScrn->scrnIndex, from == X_CONFIG ? X_WARNING : X_INFO, + "DMA is not supported on SuperSavages.\n"); + psav->CommandDMA = psav->VertexDMA = FALSE; + } if (psav->CommandDMA && psav->VertexDMA) xf86DrvMsg(pScrn->scrnIndex, from, "Will try command and vertex DMA mode\n"); -- cgit v1.2.3