From: Grazvydas Ignotas <notasas@gmail.com>
Date: Thu, 29 Mar 2012 21:23:19 +0000 (+0300)
Subject: merge omap3630 -> omap3430 in services4/system/
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7eb45e095001d34cffdd90f1f765970661f12b78;p=sgx.git

merge omap3630 -> omap3430 in services4/system/
---

diff --git a/services4/system/omap3430/sysconfig.c b/services4/system/omap3430/sysconfig.c
index 142ba41..8603c9c 100644
--- a/services4/system/omap3430/sysconfig.c
+++ b/services4/system/omap3430/sysconfig.c
@@ -739,6 +739,7 @@ PVRSRV_ERROR SysDevicePrePowerState(IMG_UINT32			ui32DeviceIndex,
 	{
 		PVR_DPF((PVR_DBG_MESSAGE, "SysDevicePrePowerState: SGX Entering state D3"));
 		DisableSGXClocks(gpsSysData);
+		PVRSRVSetDCState(DC_STATE_SUSPEND_COMMANDS);
 	}
 #else	
 	PVR_UNREFERENCED_PARAMETER(eNewPowerState );
@@ -764,6 +765,7 @@ PVRSRV_ERROR SysDevicePostPowerState(IMG_UINT32			ui32DeviceIndex,
 	if (eCurrentPowerState == PVRSRV_POWER_STATE_D3)
 	{
 		PVR_DPF((PVR_DBG_MESSAGE, "SysDevicePostPowerState: SGX Leaving state D3"));
+		PVRSRVSetDCState(DC_STATE_RESUME_COMMANDS);
 		eError = EnableSGXClocks(gpsSysData);
 	}
 #else	
diff --git a/services4/system/omap3430/sysconfig.h b/services4/system/omap3430/sysconfig.h
index d818f77..1055404 100644
--- a/services4/system/omap3430/sysconfig.h
+++ b/services4/system/omap3430/sysconfig.h
@@ -41,7 +41,7 @@
 #define SYS_OMAP3430_VDD2_OPP2_SGX_CLOCK_SPEED (SYS_SGX_CLOCK_SPEED / 2)
 
 #define SYS_OMAP3430_SGX_REGS_SYS_PHYS_BASE  0x50000000
-#define SYS_OMAP3430_SGX_REGS_SIZE           0x4000
+#define SYS_OMAP3430_SGX_REGS_SIZE           0x10000
 
 #define SYS_OMAP3430_SGX_IRQ				 21
 
diff --git a/services4/system/omap3430/sysutils_linux.c b/services4/system/omap3430/sysutils_linux.c
index b758ce1..618da6e 100644
--- a/services4/system/omap3430/sysutils_linux.c
+++ b/services4/system/omap3430/sysutils_linux.c
@@ -65,6 +65,10 @@
 #define SGX_PARENT_CLOCK "core_ck"
 #endif
 
+#undef SYS_SGX_CLOCK_SPEED
+#define SYS_SGX_CLOCK_SPEED sgx_clock_speed
+static int sgx_clock_speed;
+
 #if !defined(PDUMP) && !defined(NO_HARDWARE)
 static IMG_BOOL PowerLockWrappedOnCPU(SYS_SPECIFIC_DATA *psSysSpecData)
 {
@@ -533,6 +537,8 @@ PVRSRV_ERROR EnableSystemClocks(SYS_DATA *psSysData)
 	{
 		bPowerLock = IMG_FALSE;
 
+		sgx_clock_speed = cpu_is_omap3630() ? 200000000 : 110666666;
+
 		spin_lock_init(&psSysSpecData->sPowerLock);
 		atomic_set(&psSysSpecData->sPowerLockCPU, -1);
 		spin_lock_init(&psSysSpecData->sNotifyLock);