diff options
| author | Eric Anholt <eric@anholt.net> | 2008-06-05 11:56:42 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-06-05 11:56:42 -0700 |
| commit | 7e51384c973a96366b02ea646392c43574674111 (patch) | |
| tree | 7ab205b605e35fa88902162431f16266f82dceae /src/i830_driver.c | |
| parent | 65306cdd71dad71e4ca7229764f81a0880dd70bf (diff) | |
Replace a couple of wait-for-ring-idles with a single function to do so.
Diffstat (limited to 'src/i830_driver.c')
| -rw-r--r-- | src/i830_driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 49f8db9d..5af3153a 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1851,7 +1851,7 @@ i830_stop_ring(ScrnInfoPtr pScrn, Bool flush) if (temp & RING_VALID) { i830_refresh_ring(pScrn); I830Sync(pScrn); - DO_RING_IDLE(); + i830_wait_ring_idle(pScrn); } OUTREG(LP_RING + RING_LEN, 0); @@ -3416,10 +3416,10 @@ I830EnterVT(int scrnIndex, int flags) int i; I830DRIResume(screenInfo.screens[scrnIndex]); - + i830_refresh_ring(pScrn); I830Sync(pScrn); - DO_RING_IDLE(); + i830_wait_ring_idle(pScrn); sarea->texAge++; for(i = 0; i < I830_NR_TEX_REGIONS+1 ; i++) |