From: Kristian Høgsberg <krh@redhat.com>
Date: Fri, 29 Feb 2008 20:04:26 +0000 (-0500)
Subject: intel: Set the lock flag early to avoid deadlock.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5197a31b8e64a047d058c4cb174efb9c8b816652;p=mesa.git

intel: Set the lock flag early to avoid deadlock.

Another regression from the intel_context.c merge.
---

diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 7e39f687bfa..ab615df68b1 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -836,6 +836,7 @@ intelContendedLock(struct intel_context *intel, GLuint flags)
    int me = intel->hHWContext;
 
    drmGetLock(intel->driFd, intel->hHWContext, flags);
+   intel->locked = 1;
 
    if (INTEL_DEBUG & DEBUG_LOCK)
       _mesa_printf("%s - got contended lock\n", __progname);