media: venus: pm_helpers: Control core power domain manually

[ Upstream commit a76f43a490542ecb8c57176730b6eb665d716139 ]

Presently we use device_link to control core power domain. But this
leads to issues because the genpd doesn't guarantee synchronous on/off
for supplier devices. Switch to manually control by pmruntime calls.

Tested-by: Fritz Koenig <frkoenig@chromium.org>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index 05c9fbd51f0c057586afbe588541c4a93c9e3487..f2a0ef9ee884e488ea7ac3eb6418e1d73b408a82 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -123,7 +123,6 @@ struct venus_caps {
  * @clks:      an array of struct clk pointers
  * @vcodec0_clks: an array of vcodec0 struct clk pointers
  * @vcodec1_clks: an array of vcodec1 struct clk pointers
- * @pd_dl_venus: pmdomain device-link for venus domain
  * @pmdomains: an array of pmdomains struct device pointers
  * @vdev_dec:  a reference to video device structure for decoder instances
  * @vdev_enc:  a reference to video device structure for encoder instances
@@ -161,7 +160,6 @@ struct venus_core {
        struct icc_path *cpucfg_path;
        struct opp_table *opp_table;
        bool has_opp_table;
-       struct device_link *pd_dl_venus;
        struct device *pmdomains[VIDC_PMDOMAINS_NUM_MAX];
        struct device_link *opp_dl_venus;
        struct device *opp_pmdomain;

diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media/platform/qcom/venus/pm_helpers.c
index 2946547a0df4a445cfd105847849bf076584f8d2..bce9a370015fb8a4d51a8686f26c696428d1b7f3 100644 (file)
--- a/drivers/media/platform/qcom/venus/pm_helpers.c
+++ b/drivers/media/platform/qcom/venus/pm_helpers.c
@@ -773,13 +773,6 @@ static int vcodec_domains_get(struct device *dev)
                core->pmdomains[i] = pd;
        }
 
-       core->pd_dl_venus = device_link_add(dev, core->pmdomains[0],
-                                           DL_FLAG_PM_RUNTIME |
-                                           DL_FLAG_STATELESS |
-                                           DL_FLAG_RPM_ACTIVE);
-       if (!core->pd_dl_venus)
-               return -ENODEV;
-
 skip_pmdomains:
        if (!core->has_opp_table)
                return 0;
@@ -806,14 +799,12 @@ skip_pmdomains:
 opp_dl_add_err:
        dev_pm_opp_detach_genpd(core->opp_table);
 opp_attach_err:
-       if (core->pd_dl_venus) {
-               device_link_del(core->pd_dl_venus);
-               for (i = 0; i < res->vcodec_pmdomains_num; i++) {
-                       if (IS_ERR_OR_NULL(core->pmdomains[i]))
-                               continue;
-                       dev_pm_domain_detach(core->pmdomains[i], true);
-               }
+       for (i = 0; i < res->vcodec_pmdomains_num; i++) {
+               if (IS_ERR_OR_NULL(core->pmdomains[i]))
+                       continue;
+               dev_pm_domain_detach(core->pmdomains[i], true);
        }
+
        return ret;
 }
 
@@ -826,9 +817,6 @@ static void vcodec_domains_put(struct device *dev)
        if (!res->vcodec_pmdomains_num)
                goto skip_pmdomains;
 
-       if (core->pd_dl_venus)
-               device_link_del(core->pd_dl_venus);
-
        for (i = 0; i < res->vcodec_pmdomains_num; i++) {
                if (IS_ERR_OR_NULL(core->pmdomains[i]))
                        continue;
@@ -916,16 +904,30 @@ static void core_put_v4(struct device *dev)
 static int core_power_v4(struct device *dev, int on)
 {
        struct venus_core *core = dev_get_drvdata(dev);
+       struct device *pmctrl = core->pmdomains[0];
        int ret = 0;
 
        if (on == POWER_ON) {
+               if (pmctrl) {
+                       ret = pm_runtime_get_sync(pmctrl);
+                       if (ret < 0) {
+                               pm_runtime_put_noidle(pmctrl);
+                               return ret;
+                       }
+               }
+
                ret = core_clks_enable(core);
+               if (ret < 0 && pmctrl)
+                       pm_runtime_put_sync(pmctrl);
        } else {
                /* Drop the performance state vote */
                if (core->opp_pmdomain)
                        dev_pm_opp_set_rate(dev, 0);
 
                core_clks_disable(core);
+
+               if (pmctrl)
+                       pm_runtime_put_sync(pmctrl);
        }
 
        return ret;