Commit 0394360e authored by Yangtao Li's avatar Yangtao Li Committed by Mauro Carvalho Chehab
Browse files

media: venus: Convert to use resource-managed OPP API 



Use resource-managed OPP API to simplify code.

Signed-off-by: default avatarYangtao Li <tiny.windzz@gmail.com>
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 6e2202ca

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

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ struct venus_core { 
	struct clk *vcodec1_clks[VIDC_VCODEC_CLKS_NUM_MAX];

	struct icc_path *video_path;

	struct icc_path *cpucfg_path;

	struct opp_table *opp_table;

	bool has_opp_table;

	struct device *pmdomains[VIDC_PMDOMAINS_NUM_MAX];

	struct device_link *opp_dl_venus;

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

+11 −31
Original line number Diff line number Diff line
@@ -300,16 +300,15 @@ static int core_get_v1(struct venus_core *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);

	ret = devm_pm_opp_set_clkname(core->dev, "core");

	if (ret)

		return ret;



	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)
@@ -788,7 +787,6 @@ static int venc_power_v4(struct device *dev, int on) 
static int vcodec_domains_get(struct venus_core *core)

{

	int ret;

	struct opp_table *opp_table;

	struct device **opp_virt_dev;

	struct device *dev = core->dev;

	const struct venus_resources *res = core->res;
@@ -811,11 +809,9 @@ static int vcodec_domains_get(struct venus_core *core) 
		return 0;



	/* Attach the power domain for setting performance state */

	opp_table = dev_pm_opp_attach_genpd(dev, res->opp_pmdomain, &opp_virt_dev);

	if (IS_ERR(opp_table)) {

		ret = PTR_ERR(opp_table);

	ret = devm_pm_opp_attach_genpd(dev, res->opp_pmdomain, &opp_virt_dev);

	if (ret)

		goto opp_attach_err;

	}



	core->opp_pmdomain = *opp_virt_dev;

	core->opp_dl_venus = device_link_add(dev, core->opp_pmdomain,
@@ -824,13 +820,11 @@ static int vcodec_domains_get(struct venus_core *core) 
					     DL_FLAG_STATELESS);

	if (!core->opp_dl_venus) {

		ret = -ENODEV;

		goto opp_dl_add_err;

		goto opp_attach_err;

	}



	return 0;



opp_dl_add_err:

	dev_pm_opp_detach_genpd(core->opp_table);

opp_attach_err:

	for (i = 0; i < res->vcodec_pmdomains_num; i++) {

		if (IS_ERR_OR_NULL(core->pmdomains[i]))
@@ -861,8 +855,6 @@ static void vcodec_domains_put(struct venus_core *core) 


	if (core->opp_dl_venus)

		device_link_del(core->opp_dl_venus);



	dev_pm_opp_detach_genpd(core->opp_table);

}



static int core_resets_reset(struct venus_core *core)
@@ -941,45 +933,33 @@ static int core_get_v4(struct venus_core *core) 
	if (legacy_binding)

		return 0;



	core->opp_table = dev_pm_opp_set_clkname(dev, "core");

	if (IS_ERR(core->opp_table))

		return PTR_ERR(core->opp_table);

	ret = devm_pm_opp_set_clkname(dev, "core");

	if (ret)

		return ret;



	if (core->res->opp_pmdomain) {

		ret = dev_pm_opp_of_add_table(dev);

		ret = devm_pm_opp_of_add_table(dev);

		if (!ret) {

			core->has_opp_table = true;

		} else if (ret != -ENODEV) {

			dev_err(dev, "invalid OPP table in device tree\n");

			dev_pm_opp_put_clkname(core->opp_table);

			return ret;

		}

	}



	ret = vcodec_domains_get(core);

	if (ret) {

		if (core->has_opp_table)

			dev_pm_opp_of_remove_table(dev);

		dev_pm_opp_put_clkname(core->opp_table);

	if (ret)

		return ret;

	}



	return 0;

}



static void core_put_v4(struct venus_core *core)

{

	struct device *dev = core->dev;



	if (legacy_binding)

		return;



	vcodec_domains_put(core);



	if (core->has_opp_table)

		dev_pm_opp_of_remove_table(dev);

	dev_pm_opp_put_clkname(core->opp_table);



}



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