OSDN Git Service

intel: Set the lock flag early to avoid deadlock.
authorKristian Høgsberg <krh@redhat.com>
Fri, 29 Feb 2008 20:04:26 +0000 (15:04 -0500)
committerKristian Høgsberg <krh@redhat.com>
Fri, 29 Feb 2008 20:05:39 +0000 (15:05 -0500)
Another regression from the intel_context.c merge.

src/mesa/drivers/dri/intel/intel_context.c

index 7e39f68..ab615df 100644 (file)
@@ -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);