Skip to content

Commit

Permalink
media: venus: pm_helpers: Set opp clock name for v1
Browse files Browse the repository at this point in the history
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: 9a538b8 ("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>
  • Loading branch information
Stanimir Varbanov authored and mchehab committed Apr 6, 2021
1 parent 9b5d8fd commit 3215887
Showing 1 changed file with 18 additions and 1 deletion.
19 changes: 18 additions & 1 deletion drivers/media/platform/qcom/venus/pm_helpers.c
Expand Up @@ -279,7 +279,22 @@ static int load_scale_v1(struct venus_inst *inst)

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)
Expand All @@ -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,
};
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 3215887

Please sign in to comment.