| Message ID | 1600305963-7659-3-git-send-email-mansur@codeaurora.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Venus - change clk enable, disable order and change bw values | expand |
Quoting Mansur Alisha Shaik (2020-09-16 18:26:01) > diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c > index 52a3886..064b6c8 100644 > --- a/drivers/media/platform/qcom/venus/core.c > +++ b/drivers/media/platform/qcom/venus/core.c > @@ -363,8 +363,16 @@ static __maybe_unused int venus_runtime_suspend(struct device *dev) > > ret = icc_set_bw(core->cpucfg_path, 0, 0); > if (ret) > - return ret; > + goto err_poweron_core; > + > + ret = icc_set_bw(core->video_path, 0, 0); > + if (ret) > + goto err_poweron_core; > + > + return ret; > > +err_poweron_core: > + pm_ops->core_power(dev, POWER_ON); Don't we need to put back the bandwidth from before suspend was entered if the video_path fails? > return ret; > } >
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 52a3886..064b6c8 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -363,8 +363,16 @@ static __maybe_unused int venus_runtime_suspend(struct device *dev) ret = icc_set_bw(core->cpucfg_path, 0, 0); if (ret) - return ret; + goto err_poweron_core; + + ret = icc_set_bw(core->video_path, 0, 0); + if (ret) + goto err_poweron_core; + + return ret; +err_poweron_core: + pm_ops->core_power(dev, POWER_ON); return ret; } @@ -374,6 +382,10 @@ static __maybe_unused int venus_runtime_resume(struct device *dev) const struct venus_pm_ops *pm_ops = core->pm_ops; int ret; + ret = icc_set_bw(core->video_path, 0, kbps_to_icc(1000)); + if (ret) + return ret; + ret = icc_set_bw(core->cpucfg_path, 0, kbps_to_icc(1000)); if (ret) return ret;
Currently we are voting for venus0-ebi path during buffer processing with an average bandwidth of all the instances and unvoting during session release. While video streaming when we try to do XO-SD using the command "echo mem > /sys/power/state command" , device is not entering to suspend state and from interconnect summary seeing votes for venus0-ebi Corrected this by voting for venus0-ebi path in venus_runtime_resume() and unvote during venus_runtime_suspend(). Fixes: 7482a983d ("media: venus: redesign clocks and pm domains control") Signed-off-by: Mansur Alisha Shaik <mansur@codeaurora.org> --- Resending by adding () for functions to know it as function. drivers/media/platform/qcom/venus/core.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)