Skip to content

Commit 0394360

Browse files
TinyWindzzmchehab
authored andcommitted
media: venus: Convert to use resource-managed OPP API
Use resource-managed OPP API to simplify code. Signed-off-by: Yangtao Li <[email protected]> Signed-off-by: Dmitry Osipenko <[email protected]> Signed-off-by: Stanimir Varbanov <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent 6e2202c commit 0394360

File tree

2 files changed

+11
-32
lines changed

2 files changed

+11
-32
lines changed

drivers/media/platform/qcom/venus/core.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ struct venus_core {
155155
struct clk *vcodec1_clks[VIDC_VCODEC_CLKS_NUM_MAX];
156156
struct icc_path *video_path;
157157
struct icc_path *cpucfg_path;
158-
struct opp_table *opp_table;
159158
bool has_opp_table;
160159
struct device *pmdomains[VIDC_PMDOMAINS_NUM_MAX];
161160
struct device_link *opp_dl_venus;

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

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -300,16 +300,15 @@ static int core_get_v1(struct venus_core *core)
300300
if (ret)
301301
return ret;
302302

303-
core->opp_table = dev_pm_opp_set_clkname(core->dev, "core");
304-
if (IS_ERR(core->opp_table))
305-
return PTR_ERR(core->opp_table);
303+
ret = devm_pm_opp_set_clkname(core->dev, "core");
304+
if (ret)
305+
return ret;
306306

307307
return 0;
308308
}
309309

310310
static void core_put_v1(struct venus_core *core)
311311
{
312-
dev_pm_opp_put_clkname(core->opp_table);
313312
}
314313

315314
static int core_power_v1(struct venus_core *core, int on)
@@ -788,7 +787,6 @@ static int venc_power_v4(struct device *dev, int on)
788787
static int vcodec_domains_get(struct venus_core *core)
789788
{
790789
int ret;
791-
struct opp_table *opp_table;
792790
struct device **opp_virt_dev;
793791
struct device *dev = core->dev;
794792
const struct venus_resources *res = core->res;
@@ -811,11 +809,9 @@ static int vcodec_domains_get(struct venus_core *core)
811809
return 0;
812810

813811
/* Attach the power domain for setting performance state */
814-
opp_table = dev_pm_opp_attach_genpd(dev, res->opp_pmdomain, &opp_virt_dev);
815-
if (IS_ERR(opp_table)) {
816-
ret = PTR_ERR(opp_table);
812+
ret = devm_pm_opp_attach_genpd(dev, res->opp_pmdomain, &opp_virt_dev);
813+
if (ret)
817814
goto opp_attach_err;
818-
}
819815

820816
core->opp_pmdomain = *opp_virt_dev;
821817
core->opp_dl_venus = device_link_add(dev, core->opp_pmdomain,
@@ -824,13 +820,11 @@ static int vcodec_domains_get(struct venus_core *core)
824820
DL_FLAG_STATELESS);
825821
if (!core->opp_dl_venus) {
826822
ret = -ENODEV;
827-
goto opp_dl_add_err;
823+
goto opp_attach_err;
828824
}
829825

830826
return 0;
831827

832-
opp_dl_add_err:
833-
dev_pm_opp_detach_genpd(core->opp_table);
834828
opp_attach_err:
835829
for (i = 0; i < res->vcodec_pmdomains_num; i++) {
836830
if (IS_ERR_OR_NULL(core->pmdomains[i]))
@@ -861,8 +855,6 @@ static void vcodec_domains_put(struct venus_core *core)
861855

862856
if (core->opp_dl_venus)
863857
device_link_del(core->opp_dl_venus);
864-
865-
dev_pm_opp_detach_genpd(core->opp_table);
866858
}
867859

868860
static int core_resets_reset(struct venus_core *core)
@@ -941,45 +933,33 @@ static int core_get_v4(struct venus_core *core)
941933
if (legacy_binding)
942934
return 0;
943935

944-
core->opp_table = dev_pm_opp_set_clkname(dev, "core");
945-
if (IS_ERR(core->opp_table))
946-
return PTR_ERR(core->opp_table);
936+
ret = devm_pm_opp_set_clkname(dev, "core");
937+
if (ret)
938+
return ret;
947939

948940
if (core->res->opp_pmdomain) {
949-
ret = dev_pm_opp_of_add_table(dev);
941+
ret = devm_pm_opp_of_add_table(dev);
950942
if (!ret) {
951943
core->has_opp_table = true;
952944
} else if (ret != -ENODEV) {
953945
dev_err(dev, "invalid OPP table in device tree\n");
954-
dev_pm_opp_put_clkname(core->opp_table);
955946
return ret;
956947
}
957948
}
958949

959950
ret = vcodec_domains_get(core);
960-
if (ret) {
961-
if (core->has_opp_table)
962-
dev_pm_opp_of_remove_table(dev);
963-
dev_pm_opp_put_clkname(core->opp_table);
951+
if (ret)
964952
return ret;
965-
}
966953

967954
return 0;
968955
}
969956

970957
static void core_put_v4(struct venus_core *core)
971958
{
972-
struct device *dev = core->dev;
973-
974959
if (legacy_binding)
975960
return;
976961

977962
vcodec_domains_put(core);
978-
979-
if (core->has_opp_table)
980-
dev_pm_opp_of_remove_table(dev);
981-
dev_pm_opp_put_clkname(core->opp_table);
982-
983963
}
984964

985965
static int core_power_v4(struct venus_core *core, int on)

0 commit comments

Comments
 (0)