summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Frid <afrid@nvidia.com>2010-06-07 16:53:36 -0700
committerGary King <gking@nvidia.com>2010-06-07 17:41:49 -0700
commita4193e2ab7add3bf656198eb88b38cc2399ce57e (patch)
tree660a8cded98227235b2fd99492458a8d0155cb53
parent87ef55a65e89177f1b04ce91ceefd0b5cecc16bb (diff)
[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 <tkasivajhula@nvidia.com> Tested-by: Aleksandr Frid <afrid@nvidia.com> Reviewed-by: Gary King <gking@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/nvrm/core/common/nvrm_power.c4
1 files changed, 4 insertions, 0 deletions
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);