Bug #6620: Fixed a missing 'else' in ATIPseudoDMAInit().

Before this, we'd write some registers twice on R200 hardware and also
possibly end up with a bad value in atis->cce_pri_size.
This commit is contained in:
Alberto Mardegan 2007-03-31 16:51:24 +02:00 committed by Tilman Sauerbeck
parent 5257b32e49
commit f2808005f4

View File

@ -788,7 +788,7 @@ ATIPseudoDMAInit(ScreenPtr pScreen)
atis->cce_pri_size = MMIO_IN32(mmio, RADEON_REG_CP_CSQ_CNTL) &
R200_CSQ_CNT_PRIMARY_MASK;
MMIO_OUT32(mmio, RADEON_REG_ME_CNTL, RADEON_ME_MODE_FREE_RUN);
} if (atic->is_radeon) {
} else if (atic->is_radeon) {
MMIO_OUT32(mmio, RADEON_REG_CP_CSQ_CNTL,
RADEON_CSQ_PRIPIO_INDDIS);
atis->cce_pri_size = MMIO_IN32(mmio, RADEON_REG_CP_CSQ_CNTL) &