From a4193e2ab7add3bf656198eb88b38cc2399ce57e Mon Sep 17 00:00:00 2001 From: Alex Frid Date: Mon, 7 Jun 2010 16:53:36 -0700 Subject: [ARM/tegra] power: added RM state update in resume path. Added explicit RM state update in RM kernel resume path (no need to rely on "the 1st resumed driver must report its state to RM") ported from android-tegra-2.6.29 Change-Id: Idb86728fcb5c73e2874f3077a9d665f0b241c8e6 Reviewed-on: http://git-master/r/2232 Reviewed-by: Trivikram Kasivajhula Tested-by: Aleksandr Frid Reviewed-by: Gary King --- arch/arm/mach-tegra/nvrm/core/common/nvrm_power.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-tegra/nvrm/core/common/nvrm_power.c b/arch/arm/mach-tegra/nvrm/core/common/nvrm_power.c index e9f1ce7aa104..6ba6db9dceb5 100644 --- a/arch/arm/mach-tegra/nvrm/core/common/nvrm_power.c +++ b/arch/arm/mach-tegra/nvrm/core/common/nvrm_power.c @@ -1570,6 +1570,10 @@ NvRmKernelPowerResume( NvRmDeviceHandle hRmDeviceHandle ) NvOdmSocPowerState state = NvOdmQueryLowestSocPowerState()->LowestPowerState; + NvOsMutexLock(s_hPowerClientMutex); + ReportRmPowerState(hRmDeviceHandle); + NvOsMutexUnlock(s_hPowerClientMutex); + NvRmPrivPmuLPxStateConfig(hRmDeviceHandle, state, NV_FALSE); if (state == NvOdmSocPowerState_Suspend) NvRmPrivPowerGroupResume(hRmDeviceHandle); -- cgit v1.2.3