Revert "gpu: pvr: Add thread safety checks to SGX MMU code."

Not needed anymore, was just to get a prebuild that QA could use.

This reverts commit ca5c535e1e9cae41831adae5a29a76f848f7f792

2 files changed, 2 insertions, 107 deletions

diff --git a/drivers/gpu/pvr/mutex.c b/drivers/gpu/pvr/mutex.c
index aedc8d0..742fa03 100644
--- a/drivers/gpu/pvr/mutex.c
+++ b/drivers/gpu/pvr/mutex.c
@@ -37,12 +37,9 @@
 #include <services.h>
 
 #include "mutex.h"
-#include "osfunc.h"
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15))
 
-extern PVRSRV_LINUX_MUTEX gPVRSRVLock;
-IMG_UINT32 ui32BridgeLockPID = 0;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15))
 
 IMG_VOID LinuxInitMutex(PVRSRV_LINUX_MUTEX *psPVRSRVMutex)
 {
@@ -52,8 +49,6 @@ IMG_VOID LinuxInitMutex(PVRSRV_LINUX_MUTEX *psPVRSRVMutex)
 IMG_VOID LinuxLockMutex(PVRSRV_LINUX_MUTEX *psPVRSRVMutex)
 {
     mutex_lock(psPVRSRVMutex);
-	if(psPVRSRVMutex == &gPVRSRVLock)
-		ui32BridgeLockPID = OSGetCurrentProcessIDKM();
 }
 
 PVRSRV_ERROR LinuxLockMutexInterruptible(PVRSRV_LINUX_MUTEX *psPVRSRVMutex)
@@ -64,24 +59,17 @@ PVRSRV_ERROR LinuxLockMutexInterruptible(PVRSRV_LINUX_MUTEX *psPVRSRVMutex)
     }
     else
     {
-		if(psPVRSRVMutex == &gPVRSRVLock)
-			ui32BridgeLockPID = OSGetCurrentProcessIDKM();
         return PVRSRV_OK;
     }
 }
 
 IMG_INT32 LinuxTryLockMutex(PVRSRV_LINUX_MUTEX *psPVRSRVMutex)
 {
-    IMG_UINT32 err = mutex_trylock(psPVRSRVMutex);
-	if(psPVRSRVMutex == &gPVRSRVLock)
-		ui32BridgeLockPID = OSGetCurrentProcessIDKM();
-	return err;
+    return mutex_trylock(psPVRSRVMutex);
 }
 
 IMG_VOID LinuxUnLockMutex(PVRSRV_LINUX_MUTEX *psPVRSRVMutex)
 {
-	if(psPVRSRVMutex == &gPVRSRVLock)
-		ui32BridgeLockPID = 0;
     mutex_unlock(psPVRSRVMutex);
 }
 
diff --git a/drivers/gpu/pvr/sgx/mmu.c b/drivers/gpu/pvr/sgx/mmu.c
index d4c7e0b..9d124f5 100644
--- a/drivers/gpu/pvr/sgx/mmu.c
+++ b/drivers/gpu/pvr/sgx/mmu.c
@@ -39,8 +39,6 @@
 #include "sgx_bridge_km.h"
 #include "pdump_osfunc.h"
 
-extern IMG_UINT32 ui32BridgeLockPID;
-
 #define UINT32_MAX_VALUE	0xFFFFFFFFUL
 
 #define SGX_MAX_PD_ENTRIES	(1<<(SGX_FEATURE_ADDRESS_SPACE_SIZE - SGX_MMU_PT_SHIFT - SGX_MMU_PAGE_SHIFT))
@@ -735,12 +733,6 @@ _DeferredFreePageTable (MMU_HEAP *pMMUHeap, IMG_UINT32 ui32PTIndex, IMG_BOOL bOS
 
 	SysAcquireData(&psSysData);
 
-	if(OSGetCurrentProcessIDKM() != 1 && ui32BridgeLockPID != OSGetCurrentProcessIDKM())
-	{
-		PVR_DPF((PVR_DBG_ERROR, "ERROR!!: MMU code used by pid %u but bridge lock from pid %u", OSGetCurrentProcessIDKM(), ui32BridgeLockPID));
-		PVR_ASSERT(0);
-	}
-
 	
 	ui32PDIndex = pMMUHeap->psDevArena->BaseDevVAddr.uiAddr >> pMMUHeap->ui32PDShift;
 
@@ -920,13 +912,6 @@ _DeferredFreePageTables (MMU_HEAP *pMMUHeap)
 	IMG_UINT32 *pui32Tmp;
 	IMG_UINT32 j;
 #endif
-
-	if(OSGetCurrentProcessIDKM() != 1 && ui32BridgeLockPID != OSGetCurrentProcessIDKM())
-	{
-		PVR_DPF((PVR_DBG_ERROR, "ERROR!!: MMU code used by pid %u but bridge lock from pid %u", OSGetCurrentProcessIDKM(), ui32BridgeLockPID));
-		PVR_ASSERT(0);
-	}
-
 #if defined(PDUMP)
 	PDUMPCOMMENT("Free PTs (MMU Context ID == %u, PDBaseIndex == %u, PT count == 0x%x)",
 			pMMUHeap->psMMUContext->ui32PDumpMMUContextID,
@@ -996,12 +981,6 @@ _DeferredAllocPagetables(MMU_HEAP *pMMUHeap, IMG_DEV_VIRTADDR DevVAddr, IMG_UINT
 	IMG_UINT32 ui32ModifiedCachelines[BRN31620_CACHE_FLUSH_INDEX_SIZE];
 #endif
 
-	if(OSGetCurrentProcessIDKM() != 1 && ui32BridgeLockPID != OSGetCurrentProcessIDKM())
-	{
-		PVR_DPF((PVR_DBG_ERROR, "ERROR!!: MMU code used by pid %u but bridge lock from pid %u", OSGetCurrentProcessIDKM(), ui32BridgeLockPID));
-		PVR_ASSERT(0);
-	}
-
 	
 #if SGX_FEATURE_ADDRESS_SPACE_SIZE < 32
 	PVR_ASSERT(DevVAddr.uiAddr < (1<<SGX_FEATURE_ADDRESS_SPACE_SIZE));
@@ -2014,12 +1993,6 @@ MMU_Finalise (MMU_CONTEXT *psMMUContext)
 	MMU_CONTEXT *psMMUContextList = (MMU_CONTEXT*)psDevInfo->pvMMUContextList;
 #endif
 
-	if(OSGetCurrentProcessIDKM() != 1 && ui32BridgeLockPID != OSGetCurrentProcessIDKM())
-	{
-		PVR_DPF((PVR_DBG_ERROR, "ERROR!!: MMU code used by pid %u but bridge lock from pid %u", OSGetCurrentProcessIDKM(), ui32BridgeLockPID));
-		PVR_ASSERT(0);
-	}
-
 	SysAcquireData(&psSysData);
 
 #if defined(PDUMP)
@@ -2221,12 +2194,6 @@ MMU_InsertHeap(MMU_CONTEXT *psMMUContext, MMU_HEAP *psMMUHeap)
 	IMG_BOOL bInvalidateDirectoryCache = IMG_FALSE;
 #endif
 
-	if(OSGetCurrentProcessIDKM() != 1 && ui32BridgeLockPID != OSGetCurrentProcessIDKM())
-	{
-		PVR_DPF((PVR_DBG_ERROR, "ERROR!!: MMU code used by pid %u but bridge lock from pid %u", OSGetCurrentProcessIDKM(), ui32BridgeLockPID));
-		PVR_ASSERT(0);
-	}
-
 	
 	pui32PDCpuVAddr += psMMUHeap->psDevArena->BaseDevVAddr.uiAddr >> psMMUHeap->ui32PDShift;
 	pui32KernelPDCpuVAddr += psMMUHeap->psDevArena->BaseDevVAddr.uiAddr >> psMMUHeap->ui32PDShift;
@@ -2303,12 +2270,6 @@ MMU_UnmapPagesAndFreePTs (MMU_HEAP *psMMUHeap,
 	IMG_UINT32			*pui32Tmp;
 	IMG_BOOL			bInvalidateDirectoryCache = IMG_FALSE;
 
-	if(OSGetCurrentProcessIDKM() != 1 && ui32BridgeLockPID != OSGetCurrentProcessIDKM())
-	{
-		PVR_DPF((PVR_DBG_ERROR, "ERROR!!: MMU code used by pid %u but bridge lock from pid %u", OSGetCurrentProcessIDKM(), ui32BridgeLockPID));
-		PVR_ASSERT(0);
-	}
-
 #if !defined (PDUMP)
 	PVR_UNREFERENCED_PARAMETER(hUniqueTag);
 #endif
@@ -2444,12 +2405,6 @@ MMU_Create (MMU_CONTEXT *psMMUContext,
 
 	PVR_UNREFERENCED_PARAMETER(ppsMMUAttrib);
 
-	if(OSGetCurrentProcessIDKM() != 1 && ui32BridgeLockPID != OSGetCurrentProcessIDKM())
-	{
-		PVR_DPF((PVR_DBG_ERROR, "ERROR!!: MMU code used by pid %u but bridge lock from pid %u", OSGetCurrentProcessIDKM(), ui32BridgeLockPID));
-		PVR_ASSERT(0);
-	}
-
 	PVR_ASSERT (psDevArena != IMG_NULL);
 
 	if (psDevArena == IMG_NULL)
@@ -2639,12 +2594,6 @@ ErrorFreeHeap:
 IMG_VOID
 MMU_Delete (MMU_HEAP *pMMUHeap)
 {
-	if(OSGetCurrentProcessIDKM() != 1 && ui32BridgeLockPID != OSGetCurrentProcessIDKM())
-	{
-		PVR_DPF((PVR_DBG_ERROR, "ERROR!!: MMU code used by pid %u but bridge lock from pid %u", OSGetCurrentProcessIDKM(), ui32BridgeLockPID));
-		PVR_ASSERT(0);
-	}
-
 	if (pMMUHeap != IMG_NULL)
 	{
 		PVR_DPF ((PVR_DBG_MESSAGE, "MMU_Delete"));
@@ -2684,12 +2633,6 @@ MMU_Alloc (MMU_HEAP *pMMUHeap,
 {
 	IMG_BOOL bStatus;
 
-	if(OSGetCurrentProcessIDKM() != 1 && ui32BridgeLockPID != OSGetCurrentProcessIDKM())
-	{
-		PVR_DPF((PVR_DBG_ERROR, "ERROR!!: MMU code used by pid %u but bridge lock from pid %u", OSGetCurrentProcessIDKM(), ui32BridgeLockPID));
-		PVR_ASSERT(0);
-	}
-
 	PVR_DPF ((PVR_DBG_MESSAGE,
 		"MMU_Alloc: uSize=0x%x, flags=0x%x, align=0x%x",
 		uSize, uFlags, uDevVAddrAlignment));
@@ -2755,12 +2698,6 @@ MMU_Free (MMU_HEAP *pMMUHeap, IMG_DEV_VIRTADDR DevVAddr, IMG_UINT32 ui32Size)
 {
 	PVR_ASSERT (pMMUHeap != IMG_NULL);
 
-	if(OSGetCurrentProcessIDKM() != 1 && ui32BridgeLockPID != OSGetCurrentProcessIDKM())
-	{
-		PVR_DPF((PVR_DBG_ERROR, "ERROR!!: MMU code used by pid %u but bridge lock from pid %u", OSGetCurrentProcessIDKM(), ui32BridgeLockPID));
-		PVR_ASSERT(0);
-	}
-
 	if (pMMUHeap == IMG_NULL)
 	{
 		PVR_DPF((PVR_DBG_ERROR, "MMU_Free: invalid parameter"));
@@ -2897,12 +2834,6 @@ MMU_MapPage (MMU_HEAP *pMMUHeap,
 	IMG_UINT32 ui32MMUFlags = 0;
 	MMU_PT_INFO **ppsPTInfoList;
 
-	if(OSGetCurrentProcessIDKM() != 1 && ui32BridgeLockPID != OSGetCurrentProcessIDKM())
-	{
-		PVR_DPF((PVR_DBG_ERROR, "ERROR!!: MMU code used by pid %u but bridge lock from pid %u", OSGetCurrentProcessIDKM(), ui32BridgeLockPID));
-		PVR_ASSERT(0);
-	}
-
 	
 	PVR_ASSERT((DevPAddr.uiAddr & pMMUHeap->ui32DataPageMask) == 0);
 
@@ -3011,12 +2942,6 @@ MMU_MapScatter (MMU_HEAP *pMMUHeap,
 	IMG_UINT32 uCount, i;
 	IMG_DEV_PHYADDR DevPAddr;
 
-	if(OSGetCurrentProcessIDKM() != 1 && ui32BridgeLockPID != OSGetCurrentProcessIDKM())
-	{
-		PVR_DPF((PVR_DBG_ERROR, "ERROR!!: MMU code used by pid %u but bridge lock from pid %u", OSGetCurrentProcessIDKM(), ui32BridgeLockPID));
-		PVR_ASSERT(0);
-	}
-
 	PVR_ASSERT (pMMUHeap != IMG_NULL);
 
 #if defined(PDUMP)
@@ -3066,12 +2991,6 @@ MMU_MapPages (MMU_HEAP *pMMUHeap,
 	IMG_UINT32 ui32VAdvance;
 	IMG_UINT32 ui32PAdvance;
 
-	if(OSGetCurrentProcessIDKM() != 1 && ui32BridgeLockPID != OSGetCurrentProcessIDKM())
-	{
-		PVR_DPF((PVR_DBG_ERROR, "ERROR!!: MMU code used by pid %u but bridge lock from pid %u", OSGetCurrentProcessIDKM(), ui32BridgeLockPID));
-		PVR_ASSERT(0);
-	}
-
 	PVR_ASSERT (pMMUHeap != IMG_NULL);
 
 	PVR_DPF ((PVR_DBG_MESSAGE, "MMU_MapPages: heap:%s, heap_id:%d devVAddr=%08X, SysPAddr=%08X, size=0x%x",
@@ -3139,12 +3058,6 @@ MMU_MapShadow (MMU_HEAP          *pMMUHeap,
 	IMG_UINT32			ui32VAdvance;
 	IMG_UINT32			ui32PAdvance;
 
-	if(OSGetCurrentProcessIDKM() != 1 && ui32BridgeLockPID != OSGetCurrentProcessIDKM())
-	{
-		PVR_DPF((PVR_DBG_ERROR, "ERROR!!: MMU code used by pid %u but bridge lock from pid %u", OSGetCurrentProcessIDKM(), ui32BridgeLockPID));
-		PVR_ASSERT(0);
-	}
-
 #if !defined (PDUMP)
 	PVR_UNREFERENCED_PARAMETER(hUniqueTag);
 #endif
@@ -3234,12 +3147,6 @@ MMU_UnmapPages (MMU_HEAP *psMMUHeap,
 	IMG_UINT32			ui32PTIndex;
 	IMG_UINT32			*pui32Tmp;
 
-	if(OSGetCurrentProcessIDKM() != 1 && ui32BridgeLockPID != OSGetCurrentProcessIDKM())
-	{
-		PVR_DPF((PVR_DBG_ERROR, "ERROR!!: MMU code used by pid %u but bridge lock from pid %u", OSGetCurrentProcessIDKM(), ui32BridgeLockPID));
-		PVR_ASSERT(0);
-	}
-
 #if !defined (PDUMP)
 	PVR_UNREFERENCED_PARAMETER(hUniqueTag);
 #endif