diff options
| author | Alex Deucher <alex@botch2.com> | 2008-06-25 15:50:16 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.com> | 2008-06-25 15:50:16 -0400 |
| commit | bb1cfcbfbc1ace1f257fc3bf6401501f1a6da827 (patch) | |
| tree | 6746eec8ae2caa8f704692d9dc5b0d61bc428c08 /src/radeon_textured_videofuncs.c | |
| parent | 07be302f6dba61dd15918963fae66502230c74b7 (diff) | |
RADEON: adjustments to Jerome's last commit
- Flush caches and wait for idle after drawing
- Make sure 3D is idle too (after composite or textured video)
Diffstat (limited to 'src/radeon_textured_videofuncs.c')
| -rw-r--r-- | src/radeon_textured_videofuncs.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c index d5d1b1cf..f0dad03f 100644 --- a/src/radeon_textured_videofuncs.c +++ b/src/radeon_textured_videofuncs.c @@ -117,7 +117,10 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv OUT_VIDEO_REG(RADEON_RB3D_DSTCACHE_CTLSTAT, RADEON_RB3D_DC_FLUSH); /* We must wait for 3d to idle, in case source was just written as a dest. */ OUT_VIDEO_REG(RADEON_WAIT_UNTIL, - RADEON_WAIT_HOST_IDLECLEAN | RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_3D_IDLECLEAN); + RADEON_WAIT_HOST_IDLECLEAN | + RADEON_WAIT_2D_IDLECLEAN | + RADEON_WAIT_3D_IDLECLEAN | + RADEON_WAIT_DMA_GUI_IDLE); FINISH_VIDEO(); if (IS_R300_3D || IS_R500_3D) { @@ -640,6 +643,14 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv pBox++; } + if (IS_R300_3D | IS_R500_3D) { + BEGIN_VIDEO(2); + OUT_VIDEO_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_RB3D_DC_FLUSH_ALL); + } else + BEGIN_VIDEO(1); + OUT_VIDEO_REG(RADEON_WAIT_UNTIL, RADEON_WAIT_3D_IDLECLEAN); + FINISH_VIDEO(); + DamageDamageRegion(pPriv->pDraw, &pPriv->clip); } |