diff options
| author | Tilman Sauerbeck <tilman@code-monkey.de> | 2006-08-10 19:49:22 +0200 |
|---|---|---|
| committer | Tilman Sauerbeck <tilman@code-monkey.de> | 2006-08-10 19:49:22 +0200 |
| commit | 84ec0db961de3b10ac02ec5ae6adcec5cc439069 (patch) | |
| tree | fa2042098a15cf61f8d6044cf143b442931d1e59 /src/mga_dri.c | |
| parent | bde592047cd62194d7ef67520a9fdbaf269a8b90 (diff) | |
Initial commit of the Exa bits.
Based on ajax' mga-exa-2.patch with some straight forward fixes
by myself.
Diffstat (limited to 'src/mga_dri.c')
| -rw-r--r-- | src/mga_dri.c | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/src/mga_dri.c b/src/mga_dri.c index 6775cff..be646e5 100644 --- a/src/mga_dri.c +++ b/src/mga_dri.c @@ -390,7 +390,11 @@ void MGAGetQuiescence( ScrnInfoPtr pScrn ) OUTREG( MGAREG_YTOP, 0x00000000 ); /* minPixelPointer */ OUTREG( MGAREG_YBOT, 0x007FFFFF ); /* maxPixelPointer */ - pMga->AccelFlags &= ~CLIPPER_ON; + /* FIXME what about EXA? */ +#ifdef USE_XAA + if (!pMga->Exa && pMga->AccelInfoRec) + pMga->AccelFlags &= ~CLIPPER_ON; +#endif } } @@ -406,7 +410,12 @@ void MGAGetQuiescenceShared( ScrnInfoPtr pScrn ) if ( pMGAEnt->directRenderingEnabled ) { MGAWaitForIdleDMA( pMGAEnt->pScrn_1 ); - pMga->RestoreAccelState( pScrn ); + + /* FIXME what about EXA? */ +#ifdef USE_XAA + if (!pMga->Exa && pMga->AccelInfoRec) + pMga->RestoreAccelState( pScrn ); +#endif xf86SetLastScrnFlag( pScrn->entityList[0], pScrn->scrnIndex ); } } @@ -420,7 +429,12 @@ static void MGASwapContext( ScreenPtr pScreen ) * appropriate. */ pMga->haveQuiescense = 0; - pMga->AccelInfoRec->NeedToSync = TRUE; + + /* FIXME what about EXA? */ +#ifdef USE_XAA + if (!pMga->Exa && pMga->AccelInfoRec) + pMga->AccelInfoRec->NeedToSync = TRUE; +#endif } static void MGASwapContextShared( ScreenPtr pScreen ) @@ -432,11 +446,16 @@ static void MGASwapContextShared( ScreenPtr pScreen ) pMga = MGAPTR(pMGAEnt->pScrn_1); - pMga->haveQuiescense = 0; - pMga->AccelInfoRec->NeedToSync = TRUE; + pMga->haveQuiescense = pMGA2->haveQuiescense = 0; - pMGA2->haveQuiescense = 0; - pMGA2->AccelInfoRec->NeedToSync = TRUE; + /* FIXME what about EXA? */ +#ifdef USE_XAA + if (!pMga->Exa && pMga->AccelInfoRec) + pMga->AccelInfoRec->NeedToSync = TRUE; + + if (!pMGA2->Exa && pMGA2->AccelInfoRec) + pMGA2->AccelInfoRec->NeedToSync = TRUE; +#endif } /* FIXME: This comment is out of date, since we aren't overriding |