[i915] Fix recursive lock hang in intelContendedLock handling.

diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index 32655b87d8fd5ea833b970476e6be2812840b86f..a43b7e7816744c91d85bf62f93378d94b286c8ca 100644 (file)
--- 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;
 }