media: qcom: iris: fix runtime PM reference handling
Subsystems (4)
v4 cover media: qcom: iris: fix runtime PM reference handling
This series fixes runtime PM reference handling issues in the Qualcomm Iris driver.
Changes since v3:
- Patch 1:
- Added Dmitry Baryshkov's Reviewed-by tag.
- Patch 2:
- Reworked the OPP vote rollback path to use a standard goto-based error handling flow as suggested during review.
Patch 1 replaces pm_runtime_get_sync() with pm_runtime_resume_and_get() and ensures runtime PM references remain balanced during power domain enable and disable sequences.
Patch 2 rolls back the maximum OPP vote when pm_runtime_resume_and_get() fails, preventing stale performance state votes from remaining active on error paths.
Hungyu Lin (2):
media: qcom: iris: fix runtime PM reference leaks
media: qcom: iris: rollback OPP vote on PM resume failure
drivers/media/platform/qcom/iris/iris_resources.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
Signature · 1 line
2.34.1
PATCH v4 1/2 media: qcom: iris: fix runtime PM reference leaks
Use pm_runtime_resume_and_get() in iris_enable_power_domains() to avoid leaking a runtime PM usage count on failure.
Also ensure pm_runtime_put_sync() is always called in iris_disable_power_domains(), even when iris_opp_set_rate() fails, so runtime PM references remain balanced.
---
Changes in v4:
- Added Dmitry Baryshkov's Reviewed-by tag.
drivers/media/platform/qcom/iris/iris_resources.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/media/platform/qcom/iris/iris_resources.c +4 -6
@@ -78,11 +78,11 @@ int iris_enable_power_domains(struct iris_core *core, struct device *pd_dev)if (ret)return ret; - ret =pm_runtime_get_sync (pd_dev); -if (ret <0 ) + ret =pm_runtime_resume_and_get (pd_dev); +if (ret)return ret; -return ret; +return 0 ; }int iris_disable_power_domains (struct iris_core *core,struct device *pd_dev)
@@ -90,12 +90,10 @@ int iris_disable_power_domains(struct iris_core *core, struct device *pd_dev)int ret; ret =iris_opp_set_rate (core->dev,0 ); -if (ret) -return ret;pm_runtime_put_sync (pd_dev); -return 0 ; +return ret; }static struct clk *iris_get_clk_by_type (struct iris_core *core,enum platform_clk_type clk_type)
Signature · 1 line
2.34.1
Re: [PATCH v4 1/2] media: qcom: iris: fix runtime PM reference leaks
Quoted 24 lines · Hungyu Lin
Use
pm_runtime_resume_and_get()iniris_enable_power_domains()to avoid leaking a runtime PM usage count on failure.Also ensure
pm_runtime_put_sync()is always called iniris_disable_power_domains(), even wheniris_opp_set_rate()fails, so runtime PM references remain balanced.Fixes bb8a95aa038e ("media: iris: implement power management")Reviewed-by Dmitry Baryshkov <[email protected]>Signed-off-by Hungyu Lin <[email protected]>---
Changes in v4:
- Added Dmitry Baryshkov's Reviewed-by tag.drivers/media/platform/qcom/iris/iris_resources.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)drivers/media/platform/qcom/iris/iris_resources.c +0
-0@@ -78,11 +78,11 @@ int iris_enable_power_domains(struct iris_core *core, struct device *pd_dev)if (ret)return ret;
drivers/media/platform/qcom/iris/iris_resources.c int iris_enable_power_domains(struct iris_core *core, struct device *pd_dev) · line 86
Quoted 10 lines
drivers/media/platform/qcom/iris/iris_resources.c +3
-3- ret =pm_runtime_get_sync (pd_dev); -if (ret <0 ) + ret =pm_runtime_resume_and_get (pd_dev); +if (ret)return ret; -return ret; +return 0 ; }
"return pm_runtime_resume_and_get(pd_dev)"
drivers/media/platform/qcom/iris/iris_resources.c int iris_disable_power_domains(struct iris_core *core, struct device *pd_dev) · line 96
Quoted 13 lines
drivers/media/platform/qcom/iris/iris_resources.c +1
-3int iris_disable_power_domains (struct iris_core *core,struct device *pd_dev)@@ -90,12 +90,10 @@ int iris_disable_power_domains(struct iris_core *core, struct device *pd_dev)int ret; ret =iris_opp_set_rate (core->dev,0 ); -if (ret) -return ret;pm_runtime_put_sync (pd_dev); -return 0 ; +return ret;
put_sync() can fail too
Konrad
PATCH v4 2/2 media: qcom: iris: rollback OPP vote on PM resume failure
In reply to Hungyu LinRollback the maximum OPP vote whenpm_runtime_resume_and_get() fails iniris_enable_power_domains().
Use a standard rollback path to release the OPP vote when power domain enablement does not complete successfully.
---
Changes in v4:
- Addressed Dmitry Baryshkov's review comment.
- Reworked the error handling path to use a standard goto-based rollback flow.
- Roll back the OPP vote from a dedicated error label when pm_runtime_resume_and_get() fails.
drivers/media/platform/qcom/iris/iris_resources.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/media/platform/qcom/iris/iris_resources.c +5 -1
@@ -80,9 +80,13 @@ int iris_enable_power_domains(struct iris_core *core, struct device *pd_dev) ret =pm_runtime_resume_and_get (pd_dev);if (ret) -return ret; + goto err_opp;return 0 ; + +err_opp: +iris_opp_set_rate (core->dev,0 ); +return ret; }int iris_disable_power_domains (struct iris_core *core,struct device *pd_dev)
Signature · 1 line
2.34.1
Re: [PATCH v4 2/2] media: qcom: iris: rollback OPP vote on PM resume failure
Quoted 26 lines · Hungyu Lin
Rollback the maximum OPP vote when
pm_runtime_resume_and_get()fails iniris_enable_power_domains().Use a standard rollback path to release the OPP vote when power domain enablement does not complete successfully.
Fixes bb8a95aa038e ("media: iris: implement power management")Signed-off-by Hungyu Lin <[email protected]>---
Changes in v4:
- Addressed Dmitry Baryshkov's review comment.
- Reworked the error handling path to use a standard goto-based rollback flow.
- Roll back the OPP vote from a dedicated error label whenpm_runtime_resume_and_get()fails.drivers/media/platform/qcom/iris/iris_resources.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/media/platform/qcom/iris/iris_resources.c +0
-0@@ -80,9 +80,13 @@ int iris_enable_power_domains(struct iris_core *core, struct device *pd_dev)
drivers/media/platform/qcom/iris/iris_resources.c int iris_enable_power_domains(struct iris_core *core, struct device *pd_dev) · line 89
Quoted 10 lines
drivers/media/platform/qcom/iris/iris_resources.c +5
-1ret =pm_runtime_resume_and_get (pd_dev);if (ret) -return ret; + goto err_opp;return 0 ; + +err_opp: +iris_opp_set_rate (core->dev,0 ); +return ret;
Please add a blank line between iris_opp_set_rate(core->dev, 0); and return ret; to match the coding style used elsewhere in the driver at end of the function.
Quoted 3 lines
drivers/media/platform/qcom/iris/iris_resources.c +0
-0}int iris_disable_power_domains (struct iris_core *core,struct device *pd_dev)