From a2a0821e74a61f53cc7f0c41ce629644ad712114 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Wed, 14 Nov 2007 11:30:20 -0800 Subject: 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. --- src/i830_dri.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/i830_dri.c') 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 -- cgit v1.2.3