media: venus: pm_helpers: Set opp clock name for v1

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: stable@vger.kernel.org # v5.10+
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media/platform/qcom/venus/pm_helpers.c
index e349d01..95b4d40 100644 (file)
--- a/drivers/media/platform/qcom/venus/pm_helpers.c
+++ b/drivers/media/platform/qcom/venus/pm_helpers.c
@@ -279,7 +279,22 @@ set_freq:
 
 static int core_get_v1(struct venus_core *core)
 {
-       return core_clks_get(core);
+       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 0;
+}
+
+static void core_put_v1(struct venus_core *core)
+{
+       dev_pm_opp_put_clkname(core->opp_table);
 }
 
 static int core_power_v1(struct venus_core *core, int on)
@@ -296,6 +311,7 @@ static int core_power_v1(struct venus_core *core, 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,
 };
@@ -368,6 +384,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,