The rate of the core clock is set through devm_pm_opp_set_rate and
to avoid errors from it we have to set the name of the clock via
dev_pm_opp_set_clkname.

Fixes: 9a538b83612c ("media: venus: core: Add support for opp tables/perf 
voting")
Cc: [email protected] # v5.10+
Signed-off-by: Stanimir Varbanov <[email protected]>
---
 .../media/platform/qcom/venus/pm_helpers.c    | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c 
b/drivers/media/platform/qcom/venus/pm_helpers.c
index 43c4e3d9e281..12f6d3ab89ff 100644
--- a/drivers/media/platform/qcom/venus/pm_helpers.c
+++ b/drivers/media/platform/qcom/venus/pm_helpers.c
@@ -280,8 +280,24 @@ static int load_scale_v1(struct venus_inst *inst)
 static int core_get_v1(struct device *dev)
 {
        struct venus_core *core = dev_get_drvdata(dev);
+       int ret;
+
+       ret = core_clks_get(core);
+       if (ret)
+               return ret;
+
+       core->opp_table = dev_pm_opp_set_clkname(core->dev, "core");
+       if (IS_ERR(core->opp_table))
+               return PTR_ERR(core->opp_table);
 
-       return core_clks_get(core);
+       return 0;
+}
+
+static void core_put_v1(struct device *dev)
+{
+       struct venus_core *core = dev_get_drvdata(dev);
+
+       dev_pm_opp_put_clkname(core->opp_table);
 }
 
 static int core_power_v1(struct device *dev, int on)
@@ -299,6 +315,7 @@ static int core_power_v1(struct device *dev, int on)
 
 static const struct venus_pm_ops pm_ops_v1 = {
        .core_get = core_get_v1,
+       .core_put = core_put_v1,
        .core_power = core_power_v1,
        .load_scale = load_scale_v1,
 };
@@ -371,6 +388,7 @@ static int venc_power_v3(struct device *dev, int on)
 
 static const struct venus_pm_ops pm_ops_v3 = {
        .core_get = core_get_v1,
+       .core_put = core_put_v1,
        .core_power = core_power_v1,
        .vdec_get = vdec_get_v3,
        .vdec_power = vdec_power_v3,
-- 
2.25.1

Reply via email to