From ffa8b18c7cce5041d2006e669fe633156a6b2d05 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 Jan 2008 15:19:43 -0800 Subject: [i915] Fix recursive lock hang in intelContendedLock handling. --- src/mesa/drivers/dri/i915/intel_context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c index 32655b87d8..a43b7e7816 100644 --- a/src/mesa/drivers/dri/i915/intel_context.c +++ b/src/mesa/drivers/dri/i915/intel_context.c @@ -810,13 +810,13 @@ void LOCK_HARDWARE( struct intel_context *intel ) DRM_CAS(intel->driHwLock, intel->hHWContext, (DRM_LOCK_HELD|intel->hHWContext), __ret); + intel->locked = 1; + if (__ret) intelContendedLock( intel, 0 ); if (INTEL_DEBUG & DEBUG_LOCK) _mesa_printf("%s - locked\n", __progname); - - intel->locked = 1; } -- cgit v1.2.3