Revert "ARM: tegra: pm: turn off VDEC partition in LP1"

This reverts commit ff4983e5bf793f1abdd8e325abdbd254256f80e3.

There is no need to powergate VDE specifically in LP1 now since
the dependent change has removed the unpowergating statement in
avp suspend callback. VDE powergating in LP1 will be taken care
of in the common suspend callback.

Bug 1455975

Change-Id: Ibed11846064c1a2cdab6fb311767bcc0f90d4976
Signed-off-by: Allen Yu <alleny@nvidia.com>
Reviewed-on: http://git-master/r/380414
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c
index 9420e4633b1a32d89877bc3b58710bff0006bda5..9c5e0e48d855e6a1589b99ee6e63d7f2935b2bb7 100644 (file)
--- a/arch/arm/mach-tegra/pm.c
+++ b/arch/arm/mach-tegra/pm.c
@@ -1267,14 +1267,6 @@ static void tegra_disable_lp1bb_interrupt(void)
 }
 #endif
 
-static void tegra_suspend_powergate_control(int partid, bool turn_off)
-{
-       if (turn_off)
-               tegra_powergate_partition(partid);
-       else
-               tegra_unpowergate_partition(partid);
-}
-
 #ifdef CONFIG_TEGRA_LP0_IN_IDLE
 int tegra_enter_lp0(unsigned long sleep_time)
 {
@@ -1324,11 +1316,9 @@ int tegra_suspend_dram(enum tegra_suspend_mode mode, unsigned int flags)
        int err = 0;
        u32 scratch37 = 0xDEADBEEF;
        u32 reg;
-
 #if defined(CONFIG_ARCH_TEGRA_14x_SOC)
        u32 enter_state = 0;
 #endif
-       bool tegra_suspend_vde_powergated = false;
 
        if (WARN_ON(mode <= TEGRA_SUSPEND_NONE ||
                mode >= TEGRA_MAX_SUSPEND_MODE)) {
@@ -1357,15 +1347,6 @@ int tegra_suspend_dram(enum tegra_suspend_mode mode, unsigned int flags)
        if ((mode == TEGRA_SUSPEND_LP0) || (mode == TEGRA_SUSPEND_LP1))
                tegra_suspend_check_pwr_stats();
 
-       /* turn off VDE partition in LP1 */
-       if (mode == TEGRA_SUSPEND_LP1 &&
-               tegra_powergate_is_powered(TEGRA_POWERGATE_VDEC)) {
-               pr_info("turning off partition %s in LP1\n",
-                       tegra_powergate_get_name(TEGRA_POWERGATE_VDEC));
-               tegra_suspend_powergate_control(TEGRA_POWERGATE_VDEC, true);
-               tegra_suspend_vde_powergated = true;
-       }
-
        tegra_common_suspend();
 
        tegra_pm_set(mode);
@@ -1507,13 +1488,6 @@ int tegra_suspend_dram(enum tegra_suspend_mode mode, unsigned int flags)
 
        tegra_common_resume();
 
-       /* turn on VDE partition in LP1 */
-       if (mode == TEGRA_SUSPEND_LP1 && tegra_suspend_vde_powergated) {
-               pr_info("turning on partition %s in LP1\n",
-                       tegra_powergate_get_name(TEGRA_POWERGATE_VDEC));
-               tegra_suspend_powergate_control(TEGRA_POWERGATE_VDEC, false);
-       }
-
 fail:
        return err;
 }

diff --git a/arch/arm64/mach-tegra/pm.c b/arch/arm64/mach-tegra/pm.c
old mode 100755 (executable)
new mode 100644 (file)
index c5ee44b..8cc2f6b
--- a/arch/arm64/mach-tegra/pm.c
+++ b/arch/arm64/mach-tegra/pm.c
@@ -582,22 +582,12 @@ static void tegra_suspend_check_pwr_stats(void)
        return;
 }
 
-static void tegra_suspend_powergate_control(int partid, bool turn_off)
-{
-       if (turn_off)
-               tegra_powergate_partition(partid);
-       else
-               tegra_unpowergate_partition(partid);
-}
-
 int tegra_suspend_dram(enum tegra_suspend_mode mode, unsigned int flags)
 {
        int err = 0;
        u32 scratch37 = 0xDEADBEEF;
        u32 reg;
 
-       bool tegra_suspend_vde_powergated = false;
-
        if (WARN_ON(mode <= TEGRA_SUSPEND_NONE ||
                mode >= TEGRA_MAX_SUSPEND_MODE)) {
                err = -ENXIO;
@@ -612,15 +602,6 @@ int tegra_suspend_dram(enum tegra_suspend_mode mode, unsigned int flags)
        if ((mode == TEGRA_SUSPEND_LP0) || (mode == TEGRA_SUSPEND_LP1))
                tegra_suspend_check_pwr_stats();
 
-       /* turn off VDE partition in LP1 */
-       if (mode == TEGRA_SUSPEND_LP1 &&
-               tegra_powergate_is_powered(TEGRA_POWERGATE_VDEC)) {
-               pr_info("turning off partition %s in LP1\n",
-                       tegra_powergate_get_name(TEGRA_POWERGATE_VDEC));
-               tegra_suspend_powergate_control(TEGRA_POWERGATE_VDEC, true);
-               tegra_suspend_vde_powergated = true;
-       }
-
        tegra_common_suspend();
 
        tegra_pm_set(mode);
@@ -688,13 +669,6 @@ int tegra_suspend_dram(enum tegra_suspend_mode mode, unsigned int flags)
 
        tegra_common_resume();
 
-       /* turn on VDE partition in LP1 */
-       if (mode == TEGRA_SUSPEND_LP1 && tegra_suspend_vde_powergated) {
-               pr_info("turning on partition %s in LP1\n",
-                       tegra_powergate_get_name(TEGRA_POWERGATE_VDEC));
-               tegra_suspend_powergate_control(TEGRA_POWERGATE_VDEC, false);
-       }
-
 fail:
        return err;
 }