media: venus: core: vote for video-mem path

[ Upstream commit 9e8efdb5787986cc0d0134925cf5c4f001bb3f2e ]

Currently video driver is 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().

suspend")

Fixes: 07f8f22a33a9e ("media: venus: core: remove CNOC voting while device
Signed-off-by: Mansur Alisha Shaik <mansur@codeaurora.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 52a3886..fa363b8 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -363,7 +363,18 @@ 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_cpucfg_path;
+
+       ret = icc_set_bw(core->video_path, 0, 0);
+       if (ret)
+               goto err_video_path;
+
+       return ret;
+
+err_video_path:
+       icc_set_bw(core->cpucfg_path, kbps_to_icc(1000), 0);
+err_cpucfg_path:
+       pm_ops->core_power(dev, POWER_ON);
 
        return ret;
 }
@@ -374,6 +385,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;