xserver: Branch 'master'

[Tilman Sauerbeck]

 hw/kdrive/ati/ati_dma.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree f2808005f4ee72c5fd7f5f3dcca181306485113e (from 5257b32e492bd2082bef6a4cd0fea03ce093c0f8)
Author: Alberto Mardegan <mardy at users.sourceforge.net>
Date:   Sat Mar 31 16:51:24 2007 +0200

    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.

diff --git a/hw/kdrive/ati/ati_dma.c b/hw/kdrive/ati/ati_dma.c
index f75ff12..70b86d3 100644
--- a/hw/kdrive/ati/ati_dma.c
+++ b/hw/kdrive/ati/ati_dma.c
@@ -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) &