summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTilman Sauerbeck <tilman@code-monkey.de>2006-08-10 21:25:48 +0200
committerTilman Sauerbeck <tilman@code-monkey.de>2006-08-10 21:25:48 +0200
commitb1126b4ab81c12f178fb7366a52b6f2d38af3810 (patch)
tree7d291a8657e187507a231cc4ac18fd6e2da919b3
parent9141effdbbcd2b3419874ebb4e3898fca3474417 (diff)
Removed XAA specific code from MGAGetQuiescence.
-rw-r--r--src/mga_dri.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mga_dri.c b/src/mga_dri.c
index be646e5..d704089 100644
--- a/src/mga_dri.c
+++ b/src/mga_dri.c
@@ -370,6 +370,9 @@ void MGAGetQuiescence( ScrnInfoPtr pScrn )
MGAWaitForIdleDMA( pScrn );
+ /* FIXME what about EXA? */
+#ifdef USE_XAA
+ if (!pMga->Exa && pMga->AccelInfoRec) {
WAITFIFO( 11 );
OUTREG( MGAREG_MACCESS, pMga->MAccess );
OUTREG( MGAREG_PITCH, pLayout->displayWidth );
@@ -390,10 +393,8 @@ void MGAGetQuiescence( ScrnInfoPtr pScrn )
OUTREG( MGAREG_YTOP, 0x00000000 ); /* minPixelPointer */
OUTREG( MGAREG_YBOT, 0x007FFFFF ); /* maxPixelPointer */
- /* FIXME what about EXA? */
-#ifdef USE_XAA
- if (!pMga->Exa && pMga->AccelInfoRec)
pMga->AccelFlags &= ~CLIPPER_ON;
+ }
#endif
}
}