From: Kalle Jokiniemi <[email protected]> If CORE power domain is allowed to reach off state while display is active, the display will go blank. Fixed by adding a check in idle loop.
Signed-off-by: Kalle Jokiniemi <[email protected]> Signed-off-by: Jouni Hogander <[email protected]> --- arch/arm/mach-omap2/pm34xx.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index e8704a6..52a3f2b 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -103,7 +103,7 @@ static int (*_omap_save_secure_sram)(u32 *addr); static struct powerdomain *mpu_pwrdm, *neon_pwrdm; static struct powerdomain *core_pwrdm, *per_pwrdm; -static struct powerdomain *cam_pwrdm, *iva2_pwrdm; +static struct powerdomain *cam_pwrdm, *iva2_pwrdm, *dss_pwrdm; static struct prm_setup_vc prm_setup = { .clksetup = 0xff, @@ -427,6 +427,7 @@ void omap_sram_idle(void) int mpu_next_state = PWRDM_POWER_ON; int per_next_state = PWRDM_POWER_ON; int core_next_state = PWRDM_POWER_ON; + int dss_state = PWRDM_POWER_ON; int core_prev_state, per_prev_state; u32 sdrc_pwr = 0; int per_state_modified = 0; @@ -469,6 +470,7 @@ void omap_sram_idle(void) * save / restore. */ core_next_state = pwrdm_read_next_pwrst(core_pwrdm); + dss_state = pwrdm_read_pwrst(dss_pwrdm); if (core_next_state < PWRDM_POWER_ON) { core_saved_state = core_next_state; if ((cm_read_mod_reg(CORE_MOD, CM_IDLEST1) & CORE_IDLEST1_ALL) @@ -479,6 +481,10 @@ void omap_sram_idle(void) CORE_IDLEST3_ALL) != CORE_IDLEST3_ALL) { core_next_state = PWRDM_POWER_ON; pwrdm_set_next_pwrst(core_pwrdm, PWRDM_POWER_ON); + } else if (core_next_state == PWRDM_POWER_OFF && + dss_state == PWRDM_POWER_ON) { + core_next_state = PWRDM_POWER_RET; + pwrdm_set_next_pwrst(core_pwrdm, PWRDM_POWER_RET); } } @@ -1234,6 +1240,7 @@ static int __init omap3_pm_init(void) core_pwrdm = pwrdm_lookup("core_pwrdm"); cam_pwrdm = pwrdm_lookup("cam_pwrdm"); iva2_pwrdm = pwrdm_lookup("iva2_pwrdm"); + dss_pwrdm = pwrdm_lookup("dss_pwrdm"); omap_push_sram_idle(); #ifdef CONFIG_SUSPEND -- 1.5.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
