summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFelix Kuehling <fxkuehl@gmx.de>2005-04-14 14:47:21 +0000
committerFelix Kuehling <fxkuehl@gmx.de>2005-04-14 14:47:21 +0000
commit4629f974734368bc354bbccaec80b72ec10a66a2 (patch)
tree79e2da83061b97ea3e1bbb04aa2d16b1dae06a56 /src
parente6fc11c3fbf2b80c29f1c73a1b2175edfb7a63ef (diff)
User reports indicate that both command and vertex DMA on SuperSavages lockXORG-6_8_99_3
up the engine. Disabling DMA on SuperSavages until someone figures out how to make it work.
Diffstat (limited to 'src')
-rw-r--r--src/savage_driver.c12
1 files changed, 11 insertions, 1 deletions
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");