Skip to content

Commit 3215887

Browse files
Stanimir Varbanovmchehab
authored andcommitted
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: 9a538b8 ("media: venus: core: Add support for opp tables/perf voting") Cc: [email protected] # v5.10+ Signed-off-by: Stanimir Varbanov <[email protected]> Tested-by: Bryan O'Donoghue <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent 9b5d8fd commit 3215887

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

drivers/media/platform/qcom/venus/pm_helpers.c

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,22 @@ static int load_scale_v1(struct venus_inst *inst)
279279

280280
static int core_get_v1(struct venus_core *core)
281281
{
282-
return core_clks_get(core);
282+
int ret;
283+
284+
ret = core_clks_get(core);
285+
if (ret)
286+
return ret;
287+
288+
core->opp_table = dev_pm_opp_set_clkname(core->dev, "core");
289+
if (IS_ERR(core->opp_table))
290+
return PTR_ERR(core->opp_table);
291+
292+
return 0;
293+
}
294+
295+
static void core_put_v1(struct venus_core *core)
296+
{
297+
dev_pm_opp_put_clkname(core->opp_table);
283298
}
284299

285300
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)
296311

297312
static const struct venus_pm_ops pm_ops_v1 = {
298313
.core_get = core_get_v1,
314+
.core_put = core_put_v1,
299315
.core_power = core_power_v1,
300316
.load_scale = load_scale_v1,
301317
};
@@ -368,6 +384,7 @@ static int venc_power_v3(struct device *dev, int on)
368384

369385
static const struct venus_pm_ops pm_ops_v3 = {
370386
.core_get = core_get_v1,
387+
.core_put = core_put_v1,
371388
.core_power = core_power_v1,
372389
.vdec_get = vdec_get_v3,
373390
.vdec_power = vdec_power_v3,

0 commit comments

Comments
 (0)