diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-02-29 15:04:26 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2008-02-29 15:05:39 -0500 |
| commit | 5197a31b8e64a047d058c4cb174efb9c8b816652 (patch) | |
| tree | 3c820cf8b478d0c9ecfc12b77b388b07f9ea9bac /src/mesa/drivers | |
| parent | de1e9880f8b239768293f7f434a9117dfab20162 (diff) | |
intel: Set the lock flag early to avoid deadlock.
Another regression from the intel_context.c merge.
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 7e39f687bf..ab615df68b 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); |