Commit a76f43a4 authored by Stanimir Varbanov's avatar Stanimir Varbanov Committed by Mauro Carvalho Chehab
Browse files

media: venus: pm_helpers: Control core power domain manually 



Presently we use device_link to control core power domain. But this
leads to issues because the genpd doesn't guarantee synchronous on/off
for supplier devices. Switch to manually control by pmruntime calls.

Tested-by: default avatarFritz Koenig <frkoenig@chromium.org>
Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 74c357fc

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

+0 −2
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ struct venus_format { 
 * @clks:	an array of struct clk pointers

 * @vcodec0_clks: an array of vcodec0 struct clk pointers

 * @vcodec1_clks: an array of vcodec1 struct clk pointers

 * @pd_dl_venus: pmdomain device-link for venus domain

 * @pmdomains:	an array of pmdomains struct device pointers

 * @vdev_dec:	a reference to video device structure for decoder instances

 * @vdev_enc:	a reference to video device structure for encoder instances
@@ -128,7 +127,6 @@ struct venus_core { 
	struct icc_path *cpucfg_path;

	struct opp_table *opp_table;

	bool has_opp_table;

	struct device_link *pd_dl_venus;

	struct device *pmdomains[VIDC_PMDOMAINS_NUM_MAX];

	struct device_link *opp_dl_venus;

	struct device *opp_pmdomain;

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

+19 −17
Original line number Diff line number Diff line
@@ -774,13 +774,6 @@ static int vcodec_domains_get(struct device *dev) 
		core->pmdomains[i] = pd;

	}



	core->pd_dl_venus = device_link_add(dev, core->pmdomains[0],

					    DL_FLAG_PM_RUNTIME |

					    DL_FLAG_STATELESS |

					    DL_FLAG_RPM_ACTIVE);

	if (!core->pd_dl_venus)

		return -ENODEV;



skip_pmdomains:

	if (!core->has_opp_table)

		return 0;
@@ -807,14 +800,12 @@ static int vcodec_domains_get(struct device *dev) 
opp_dl_add_err:

	dev_pm_opp_detach_genpd(core->opp_table);

opp_attach_err:

	if (core->pd_dl_venus) {

		device_link_del(core->pd_dl_venus);

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

		if (IS_ERR_OR_NULL(core->pmdomains[i]))

			continue;

		dev_pm_domain_detach(core->pmdomains[i], true);

	}

	}



	return ret;

}
@@ -827,9 +818,6 @@ static void vcodec_domains_put(struct device *dev) 
	if (!res->vcodec_pmdomains_num)

		goto skip_pmdomains;



	if (core->pd_dl_venus)

		device_link_del(core->pd_dl_venus);



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

		if (IS_ERR_OR_NULL(core->pmdomains[i]))

			continue;
@@ -916,16 +904,30 @@ static void core_put_v4(struct device *dev) 
static int core_power_v4(struct device *dev, int on)

{

	struct venus_core *core = dev_get_drvdata(dev);

	struct device *pmctrl = core->pmdomains[0];

	int ret = 0;



	if (on == POWER_ON) {

		if (pmctrl) {

			ret = pm_runtime_get_sync(pmctrl);

			if (ret < 0) {

				pm_runtime_put_noidle(pmctrl);

				return ret;

			}

		}



		ret = core_clks_enable(core);

		if (ret < 0 && pmctrl)

			pm_runtime_put_sync(pmctrl);

	} else {

		/* Drop the performance state vote */

		if (core->opp_pmdomain)

			dev_pm_opp_set_rate(dev, 0);



		core_clks_disable(core);



		if (pmctrl)

			pm_runtime_put_sync(pmctrl);

	}



	return ret;