diff options
| author | Eric Anholt <eric@anholt.net> | 2008-01-14 15:19:43 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-01-14 15:19:43 -0800 |
| commit | ffa8b18c7cce5041d2006e669fe633156a6b2d05 (patch) | |
| tree | b49071846053f34d438c2672c00e2c50e71562f2 /src/mesa/drivers/dri/i915/intel_context.c | |
| parent | d42400db87f38aee3647e87a9622689519c6b553 (diff) | |
[i915] Fix recursive lock hang in intelContendedLock handling.
Diffstat (limited to 'src/mesa/drivers/dri/i915/intel_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_context.c | 4 |
1 files 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; } |