From: Imre Deak <imre.deak@nokia.com>
Date: Thu, 22 Jul 2010 11:00:12 +0000 (+0300)
Subject: gpu: pvr: omaplfb: remove unnecessary fb unblanking
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e35111e0266496ff56871a262ff0482cee3dd9a7;p=sgx.git

gpu: pvr: omaplfb: remove unnecessary fb unblanking

This is unnecessary and is causing a lockdep problem with the DSS
driver.

Signed-off-by: Imre Deak <imre.deak@nokia.com>
---

diff --git a/pvr/omaplfb_displayclass.c b/pvr/omaplfb_displayclass.c
index c33b83a..4348b2e 100644
--- a/pvr/omaplfb_displayclass.c
+++ b/pvr/omaplfb_displayclass.c
@@ -75,28 +75,11 @@ static int FrameBufferEvents(struct notifier_block *psNotif,
 	return 0;
 }
 
-static enum PVRSRV_ERROR UnblankDisplay(struct OMAPLFB_DEVINFO *psDevInfo)
-{
-	int res;
-
-	acquire_console_sem();
-	res = fb_blank(psDevInfo->psLINFBInfo, 0);
-	release_console_sem();
-	if (res != 0) {
-		printk(KERN_WARNING DRIVER_PREFIX
-		       ": fb_blank failed (%d)", res);
-		return PVRSRV_ERROR_GENERIC;
-	}
-
-	return PVRSRV_OK;
-}
-
 static enum PVRSRV_ERROR EnableLFBEventNotification(struct OMAPLFB_DEVINFO
 								   *psDevInfo)
 {
 	int res;
 	struct OMAPLFB_SWAPCHAIN *psSwapChain = psDevInfo->psSwapChain;
-	enum PVRSRV_ERROR eError;
 
 	memset(&psDevInfo->sLINNotifBlock, 0,
 	       sizeof(psDevInfo->sLINNotifBlock));
@@ -113,13 +96,6 @@ static enum PVRSRV_ERROR EnableLFBEventNotification(struct OMAPLFB_DEVINFO
 		return PVRSRV_ERROR_GENERIC;
 	}
 
-	eError = UnblankDisplay(psDevInfo);
-	if (eError != PVRSRV_OK) {
-		DEBUG_PRINTK((KERN_WARNING DRIVER_PREFIX
-			      ": UnblankDisplay failed (%d)", eError));
-		return eError;
-	}
-
 	return PVRSRV_OK;
 }
 
@@ -142,7 +118,6 @@ static enum PVRSRV_ERROR OpenDCDevice(u32 ui32DeviceID, void **phDevice,
 				struct PVRSRV_SYNC_DATA *psSystemBufferSyncData)
 {
 	struct OMAPLFB_DEVINFO *psDevInfo;
-	enum PVRSRV_ERROR eError;
 
 	PVR_UNREFERENCED_PARAMETER(ui32DeviceID);
 
@@ -150,13 +125,6 @@ static enum PVRSRV_ERROR OpenDCDevice(u32 ui32DeviceID, void **phDevice,
 
 	psDevInfo->sSystemBuffer.psSyncData = psSystemBufferSyncData;
 
-	eError = UnblankDisplay(psDevInfo);
-	if (eError != PVRSRV_OK) {
-		DEBUG_PRINTK((KERN_WARNING DRIVER_PREFIX
-			      ": UnblankDisplay failed (%d)", eError));
-		return eError;
-	}
-
 	*phDevice = (void *) psDevInfo;
 
 	return PVRSRV_OK;