From: Eric Anholt <eric@anholt.net>
Date: Mon, 29 Jun 2009 16:48:28 +0000 (-0700)
Subject: intel: Remove unneded pthread mutex in LOCK_HARDWARE.
X-Git-Tag: mesa-7.8~4019^2~120
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de447afff26706e3bf8bdcd5cfb8b1daf49b4b21;p=platform%2Fupstream%2Fmesa.git

intel: Remove unneded pthread mutex in LOCK_HARDWARE.

This would cause LOCK_HARDWARE to mutex all contexts in this process on
both DRI1 and DRI2.  On DRI1, LOCK_HARDWARE already does it for all
processes on the system.  On DRI2, LOCK_HARDWARE doesn't, but there shouldn't
be any state outside the context that needs any additional protection.
Notably, the bufmgr is protected by its own mutex and not
LOCK_HARDWARE.

This code was originally introduced with the i915tex code dump, so it's not
clear what it was there for.
---

diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 00dfb3d..c2280de 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -1038,8 +1038,6 @@ intelContendedLock(struct intel_context *intel, GLuint flags)
 }
 
 
-_glthread_DECLARE_STATIC_MUTEX(lockMutex);
-
 /* Lock the hardware and validate our state.  
  */
 void LOCK_HARDWARE( struct intel_context *intel )
@@ -1054,8 +1052,6 @@ void LOCK_HARDWARE( struct intel_context *intel )
     if (intel->locked >= 2)
        return;
 
-    _glthread_LOCK_MUTEX(lockMutex);
-
     if (intel->driDrawable) {
        intel_fb = intel->driDrawable->driverPrivate;
 
@@ -1111,8 +1107,6 @@ void UNLOCK_HARDWARE( struct intel_context *intel )
    if (!sPriv->dri2.enabled)
       DRM_UNLOCK(intel->driFd, intel->driHwLock, intel->hHWContext);
 
-   _glthread_UNLOCK_MUTEX(lockMutex);
-
    if (INTEL_DEBUG & DEBUG_LOCK)
       _mesa_printf("%s - unlocked\n", __progname);