diff options
| author | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-11-14 11:30:20 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-11-14 11:30:20 -0800 |
| commit | a2a0821e74a61f53cc7f0c41ce629644ad712114 (patch) | |
| tree | bfd55e57dd4725bad8b14eda47d2f95613671816 /src/i830_dri.c | |
| parent | ad3bc0158d37e98fcbbe6a8e31413c142a260424 (diff) | |
Don't stop ring before restoring hw state
Some of the hw state restoration callbacks may want to use the ring for various
things like stopping video playback, so leave the ring enabled until we get
back from RestoreHWState. Also rename the functions so that their purpose is
clearer and remove a couple of redundant lines.
Diffstat (limited to 'src/i830_dri.c')
| -rw-r--r-- | src/i830_dri.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_dri.c b/src/i830_dri.c index 49288080..b223b02e 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -1093,7 +1093,7 @@ I830DRISwapContext(ScreenPtr pScreen, DRISyncType syncType, if (!pScrn->vtSema) return; pI830->LockHeld = 1; - I830RefreshRing(pScrn); + i830_refresh_ring(pScrn); I830EmitFlush(pScrn); @@ -1777,7 +1777,7 @@ I830DRILock(ScrnInfoPtr pScrn) if (pI830->directRenderingEnabled && !pI830->LockHeld) { DRILock(screenInfo.screens[pScrn->scrnIndex], 0); pI830->LockHeld = 1; - I830RefreshRing(pScrn); + i830_refresh_ring(pScrn); return TRUE; } else |