From 9011ae107ca3fda22cd4664a60f20683eabc254a Mon Sep 17 00:00:00 2001
From: Imre Deak <imre.deak@nokia.com>
Date: Tue, 6 Apr 2010 01:48:58 +0300
Subject: [PATCH] gpu: pvr: no need to check for IRQ context in
 SGXCommandComplete
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This function isn't called in IRQ context from anywhere, so remove
the related checks.

Signed-off-by: Imre Deak <imre.deak@nokia.com>
CC: Mark Underwood <mark.underwood@imgtec.com>
CC: Mark Riding <mark.riding@imgtec.com>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@nokia.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com>
---
 pvr/osfunc.h  | 8 --------
 pvr/sgxinit.c | 7 +++----
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/pvr/osfunc.h b/pvr/osfunc.h
index afe1ae6..2d79af9 100644
--- a/pvr/osfunc.h
+++ b/pvr/osfunc.h
@@ -213,12 +213,4 @@ enum PVRSRV_ERROR OSAcquirePhysPageAddr(void *pvCPUVAddr, u32 ui32Bytes,
 					void **phOSWrapMem);
 enum PVRSRV_ERROR OSReleasePhysPageAddr(void *hOSWrapMem);
 
-#if defined(__KERNEL__)
-#define	OS_SUPPORTS_IN_LISR
-static inline IMG_BOOL OSInLISR(void unref__ * pvSysData)
-{
-	return in_irq();
-}
-#endif
-
 #endif
diff --git a/pvr/sgxinit.c b/pvr/sgxinit.c
index 8cd0146..b9afb5a 100644
--- a/pvr/sgxinit.c
+++ b/pvr/sgxinit.c
@@ -63,10 +63,9 @@ static enum PVRSRV_ERROR SGXGetBuildInfoKM(struct PVRSRV_SGXDEV_INFO *psDevInfo,
 
 static void SGXCommandComplete(struct PVRSRV_DEVICE_NODE *psDeviceNode)
 {
-	if (OSInLISR(psDeviceNode->psSysData))
-		psDeviceNode->bReProcessDeviceCommandComplete = IMG_TRUE;
-	else
-		SGXScheduleProcessQueuesKM(psDeviceNode);
+	BUG_ON(in_irq());
+
+	SGXScheduleProcessQueuesKM(psDeviceNode);
 }
 
 static u32 DeinitDevInfo(struct PVRSRV_SGXDEV_INFO *psDevInfo)
-- 
2.39.5