Venus - change clk enable, disable order and change bw values
Subsystems (4)
v2 cover Venus - change clk enable, disable order and change bw values
The intention of this patchset is to correct clock enable and disable order and vote for venus-ebi and cpucfg paths with average bandwidth instad of peak bandwidth since with current implementation we are seeing clock related warning during XO-SD and suspend device while video playback
---
Resending as all patches not updated properly because
of some mailing issues
Mansur Alisha Shaik (4):
venus: core: change clk enable and disable order in resume and suspend
venus: core: vote for video-mem path
venus: core: vote with average bandwidth and peak bandwidth as zero
venus: put dummy vote on video-mem path after last session release
drivers/media/platform/qcom/venus/core.c | 29 +++++++++++++++++++------- drivers/media/platform/qcom/venus/pm_helpers.c | 3 +++ 2 files changed, 25 insertions(+), 7 deletions(-)
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH RESEND v2 1/4 venus: core: change clk enable and disable order in resume and suspend
Currently video driver is voting after clk enable and un voting before clk disable. Basically we should vote before clk enable and un vote after clk disable.
Corrected this by changing the order of clk enable and clk disable.
--- drivers/media/platform/qcom/venus/core.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/media/platform/qcom/venus/core.c +10 -7
@@ -355,13 +355,16 @@ static __maybe_unused int venus_runtime_suspend(struct device *dev)if (ret)return ret; +if (pm_ops->core_power) { + ret = pm_ops->core_power (dev,POWER_OFF ); +if (ret) +return ret; + } + ret =icc_set_bw (core->cpucfg_path,0 ,0 );if (ret)return ret; -if (pm_ops->core_power) - ret = pm_ops->core_power (dev,POWER_OFF ); -return ret; }
@@ -371,16 +374,16 @@ 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->cpucfg_path,0 ,kbps_to_icc (1000 )); +if (ret) +return ret; +if (pm_ops->core_power) { ret = pm_ops->core_power (dev,POWER_ON );if (ret)return ret; } - ret =icc_set_bw (core->cpucfg_path,0 ,kbps_to_icc (1000 )); -if (ret) -return ret; -return hfi_core_resume (core, false); }
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [RESEND v2 1/4] venus: core: change clk enable and disable order in resume and suspend
Quoting Mansur Alisha Shaik (2020-09-16 18:26:00)
Quoted 9 lines
Currently video driver is voting after clk enable and un voting before clk disable. Basically we should vote before clk enable and un vote after clk disable.
Corrected this by changing the order of clk enable and clk disable.
Fixes 7482a983d ("media: venus: redesign clocks and pm domains control")Signed-off-by Mansur Alisha Shaik <[email protected]>---
PATCH RESEND v2 2/4 venus: core: vote for video-mem path
In reply to Mansur Alisha ShaikCurrently 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().
---
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(-)
drivers/media/platform/qcom/venus/core.c +13 -1
@@ -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;
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [RESEND v2 2/4] venus: core: vote for video-mem path
Quoting Mansur Alisha Shaik (2020-09-16 18:26:01)
Quoted 9 lines
drivers/media/platform/qcom/venus/core.c +0
-1@@ -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;
drivers/media/platform/qcom/venus/core.c static __maybe_unused int venus_runtime_suspend(struct device *dev) · line 375
Quoted 10 lines
drivers/media/platform/qcom/venus/core.c +9
-0+ 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?
Quoted 3 lines
drivers/media/platform/qcom/venus/core.c +0
-0return ret; }
PATCH RESEND v2 3/4 venus: core: vote with average bandwidth and peak bandwidth as zero
In reply to Mansur Alisha ShaikAs per bandwidth table we are voting with average bandwidth for "video-mem" and "cpu-cfg" paths as peak bandwidth is zero in bandwidth table.
--- drivers/media/platform/qcom/venus/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/venus/core.c +2 -2
@@ -382,11 +382,11 @@ 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 )); + ret =icc_set_bw (core->video_path,kbps_to_icc (20000 ),0 );if (ret)return ret; - ret =icc_set_bw (core->cpucfg_path,0 ,kbps_to_icc (1000 )); + ret =icc_set_bw (core->cpucfg_path,kbps_to_icc (1000 ),0 );if (ret)return ret;
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [RESEND v2 3/4] venus: core: vote with average bandwidth and peak bandwidth as zero
Quoting Mansur Alisha Shaik (2020-09-16 18:26:02)
Quoted 3 lines
As per bandwidth table we are voting with average bandwidth for "video-mem" and "cpu-cfg" paths as peak bandwidth is zero in bandwidth table.
Why? It is in "the bandwidth table" but is there any reason why peak bandwidth is 0 while average bandwidth is non-zero? Seems odd.
Quoted 3 lines
Signed-off-by Mansur Alisha Shaik <[email protected]>---
Probably needs a Fixes tag?
PATCH RESEND v2 4/4 venus: put dummy vote on video-mem path after last session release
In reply to Mansur Alisha ShaikAs per current implementation, we are unvoting "videom-mem" path for last video session during vdec_session_release().
While video playback when we try to suspend device, we see video clock warnings since votes are already removed during vdec_session_release().
corrected this by putting dummy vote on "video-mem" after last video session release and unvoting it during suspend.
--- drivers/media/platform/qcom/venus/pm_helpers.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/platform/qcom/venus/pm_helpers.c +3 -0
@@ -212,6 +212,9 @@ static int load_scale_bw(struct venus_core *core) }mutex_unlock (&core->lock); +if (!total_avg && !total_peak) + total_avg =kbps_to_icc (1000 ); +dev_dbg (core->dev,VDBGL "total: avg_bw: %u, peak_bw: %u\n" , total_avg, total_peak);
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [RESEND v2 4/4] venus: put dummy vote on video-mem path after last session release
Quoting Mansur Alisha Shaik (2020-09-16 18:26:03)
Quoted 10 lines
As per current implementation, we are unvoting "videom-mem" path for last video session during
vdec_session_release().
While video playback when we try to suspend device, we see video clock warnings since votes are already removed duringvdec_session_release().corrected this by putting dummy vote on "video-mem" after last video session release and unvoting it during suspend.
Signed-off-by Mansur Alisha Shaik <[email protected]>---
Fixes tag? Should this be combined with an earlier change?
drivers/media/platform/qcom/venus/pm_helpers.c static int load_scale_bw(struct venus_core *core) · line 216
Quoted 13 lines
drivers/media/platform/qcom/venus/pm_helpers.c | 3 +++ 1 file changed, 3 insertions(+)drivers/media/platform/qcom/venus/pm_helpers.c +2
-0@@ -212,6 +212,9 @@ static int load_scale_bw(struct venus_core *core) }mutex_unlock (&core->lock); +if (!total_avg && !total_peak) + total_avg =kbps_to_icc (1000 );
Can you add a comment in the code here? Just guessing but something like..
/*
* Keep bandwidth enabled here so that vdec_session_release()
* can disable clks without clks getting stuck. We'll drop the
* bandwidth request when this device is suspended so this is a
* low value to keep things on but not high power until the
* device is powered down.
*/
Quoted 4 lines
drivers/media/platform/qcom/venus/pm_helpers.c +1
-0+dev_dbg (core->dev,VDBGL "total: avg_bw: %u, peak_bw: %u\n" , total_avg, total_peak);