From: Tero Kristo <[email protected]>

Prevent the CORE power domain from entering RETENTION or OFF when DSS
is on.  Otherwise, the display FIFO(s) may underflow due to the time
needed for the CORE to wake back up, causing tearing and unnecessary
interrupts.

Signed-off-by: Tero Kristo <[email protected]>
[[email protected]: wrote commit message]
Signed-off-by: Paul Walmsley <[email protected]>
---
 arch/arm/mach-omap2/cpuidle34xx.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/cpuidle34xx.c 
b/arch/arm/mach-omap2/cpuidle34xx.c
index 0335cd8..d1b7789 100644
--- a/arch/arm/mach-omap2/cpuidle34xx.c
+++ b/arch/arm/mach-omap2/cpuidle34xx.c
@@ -9,8 +9,9 @@
  * Copyright (C) 2007 Texas Instruments, Inc.
  * Karthik Dasu <[email protected]>
  *
- * Copyright (C) 2006 Nokia Corporation
+ * Copyright (C) 2006, 2011 Nokia Corporation
  * Tony Lindgren <[email protected]>
+ * Tero Kristo <[email protected]>
  *
  * Copyright (C) 2005 Texas Instruments, Inc.
  * Richard Woodruff <[email protected]>
@@ -268,6 +269,12 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev,
                goto select_state;
        }
 
+       /* If DSS is active, prevent CORE RET/OFF */
+       dss_state = pwrdm_read_pwrst(dss_pd);
+       if (dss_state == PWRDM_POWER_ON &&
+           core_next_state != PWRDM_POWER_ON)
+               core_next_state = PWRDM_POWER_INACTIVE;
+
        /*
         * Prevent PER off if CORE is not in retention or off as this
         * would disable PER wakeups completely.
@@ -288,7 +295,6 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev,
                iva2_state = pwrdm_read_pwrst(iva2_pd);
                sgx_state = pwrdm_read_pwrst(sgx_pd);
                usb_state = pwrdm_read_pwrst(usb_pd);
-               dss_state = pwrdm_read_pwrst(dss_pd);
 
                if (cam_state > PWRDM_POWER_OFF ||
                    dss_state > PWRDM_POWER_OFF ||


--
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

Reply via email to