2 files changed, 17 insertions, 4 deletions

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 3d899e8abd58..a887575fafa9 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -130,6 +130,7 @@ static const struct genpd_lock_ops genpd_spin_ops = {
 #define genpd_is_always_on(genpd)       (genpd->flags & GENPD_FLAG_ALWAYS_ON)
 #define genpd_is_active_wakeup(genpd)   (genpd->flags & GENPD_FLAG_ACTIVE_WAKEUP)
 #define genpd_is_cpu_domain(genpd)      (genpd->flags & GENPD_FLAG_CPU_DOMAIN)
+#define genpd_is_rpm_always_on(genpd)   (genpd->flags & GENPD_FLAG_RPM_ALWAYS_ON)
 
 static inline bool irq_safe_dev_in_no_sleep_domain(struct device *dev,
                 const struct generic_pm_domain *genpd)
@@ -517,7 +518,9 @@ static int genpd_power_off(struct generic_pm_domain *genpd, bool one_dev_on,
          * (1) The domain is configured as always on.
          * (2) When the domain has a subdomain being powered on.
          */
-        if (genpd_is_always_on(genpd) || atomic_read(&genpd->sd_count) > 0)
+        if (genpd_is_always_on(genpd) ||
+                        genpd_is_rpm_always_on(genpd) ||
+                        atomic_read(&genpd->sd_count) > 0)
                 return -EBUSY;
 
         list_for_each_entry(pdd, &genpd->dev_list, list_node) {
@@ -1814,7 +1817,8 @@ int pm_genpd_init(struct generic_pm_domain *genpd,
         }
 
         /* Always-on domains must be powered on at initialization. */
-        if (genpd_is_always_on(genpd) && !genpd_status_on(genpd))
+        if ((genpd_is_always_on(genpd) || genpd_is_rpm_always_on(genpd)) &&
+                        !genpd_status_on(genpd))
                 return -EINVAL;
 
         if (genpd_is_cpu_domain(genpd) &&
diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c
index 7d14a4b4e82a..29b43651c261 100644
--- a/drivers/soc/imx/gpc.c
+++ b/drivers/soc/imx/gpc.c
@@ -431,10 +431,19 @@ static int imx_gpc_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        /* Disable PU power down in normal operation if ERR009619 is present */
+        /*
+         * Disable PU power down by runtime PM if ERR009619 is present.
+         *
+         * The PRE clock will be paused for several cycles when turning on the
+         * PU domain LDO from power down state. If PRE is in use at that time,
+         * the IPU/PRG cannot get the correct display data from the PRE.
+         *
+         * This is not a concern when the whole system enters suspend state, so
+         * it's safe to power down PU in this case.
+         */
         if (of_id_data->err009619_present)
                 imx_gpc_domains[GPC_PGC_DOMAIN_PU].base.flags |=
-                                GENPD_FLAG_ALWAYS_ON;
+                                GENPD_FLAG_RPM_ALWAYS_ON;
 
         /* Keep DISP always on if ERR006287 is present */
         if (of_id_data->err006287_present)