mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v4 0/2] media: qcom: iris: fix runtime PM reference handling
@ 2026-06-07 23:28 Hungyu Lin
  2026-06-07 23:28 ` [PATCH v4 1/2] media: qcom: iris: fix runtime PM reference leaks Hungyu Lin
  2026-06-07 23:28 ` [PATCH v4 2/2] media: qcom: iris: rollback OPP vote on PM resume failure Hungyu Lin
  0 siblings, 2 replies; 5+ messages in thread
From: Hungyu Lin @ 2026-06-07 23:28 UTC (permalink / raw)
  To: linux-media
  Cc: linux-arm-msm, linux-kernel, vikash.garodia, abhinav.kumar, bod,
	mchehab, hverkuil, stefan.schmidt, Hungyu Lin

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(-)

-- 
2.34.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v4 1/2] media: qcom: iris: fix runtime PM reference leaks
  2026-06-07 23:28 [PATCH v4 0/2] media: qcom: iris: fix runtime PM reference handling Hungyu Lin
@ 2026-06-07 23:28 ` Hungyu Lin
  2026-06-08  7:38   ` Konrad Dybcio
  2026-06-07 23:28 ` [PATCH v4 2/2] media: qcom: iris: rollback OPP vote on PM resume failure Hungyu Lin
  1 sibling, 1 reply; 5+ messages in thread
From: Hungyu Lin @ 2026-06-07 23:28 UTC (permalink / raw)
  To: linux-media
  Cc: linux-arm-msm, linux-kernel, vikash.garodia, abhinav.kumar, bod,
	mchehab, hverkuil, stefan.schmidt, Hungyu Lin, Dmitry Baryshkov

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.

Fixes: bb8a95aa038e ("media: iris: implement power management")
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Hungyu Lin <dennylin0707@gmail.com>
---
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(-)

diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c
index 773f6548370a..f5e3341e1430 100644
--- a/drivers/media/platform/qcom/iris/iris_resources.c
+++ b/drivers/media/platform/qcom/iris/iris_resources.c
@@ -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)
-- 
2.34.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v4 2/2] media: qcom: iris: rollback OPP vote on PM resume failure
  2026-06-07 23:28 [PATCH v4 0/2] media: qcom: iris: fix runtime PM reference handling Hungyu Lin
  2026-06-07 23:28 ` [PATCH v4 1/2] media: qcom: iris: fix runtime PM reference leaks Hungyu Lin
@ 2026-06-07 23:28 ` Hungyu Lin
  2026-06-08  6:29   ` Vishnu Reddy
  1 sibling, 1 reply; 5+ messages in thread
From: Hungyu Lin @ 2026-06-07 23:28 UTC (permalink / raw)
  To: linux-media
  Cc: linux-arm-msm, linux-kernel, vikash.garodia, abhinav.kumar, bod,
	mchehab, hverkuil, stefan.schmidt, Hungyu Lin

Rollback the maximum OPP vote when
pm_runtime_resume_and_get() fails in
iris_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 <dennylin0707@gmail.com>
---
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(-)

diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c
index f5e3341e1430..9059cbe8fe5f 100644
--- a/drivers/media/platform/qcom/iris/iris_resources.c
+++ b/drivers/media/platform/qcom/iris/iris_resources.c
@@ -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)
-- 
2.34.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v4 2/2] media: qcom: iris: rollback OPP vote on PM resume failure
  2026-06-07 23:28 ` [PATCH v4 2/2] media: qcom: iris: rollback OPP vote on PM resume failure Hungyu Lin
@ 2026-06-08  6:29   ` Vishnu Reddy
  0 siblings, 0 replies; 5+ messages in thread
From: Vishnu Reddy @ 2026-06-08  6:29 UTC (permalink / raw)
  To: Hungyu Lin, linux-media
  Cc: linux-arm-msm, linux-kernel, vikash.garodia, abhinav.kumar, bod,
	mchehab, hverkuil, stefan.schmidt


On 6/8/2026 4:58 AM, Hungyu Lin wrote:
> Rollback the maximum OPP vote when
> pm_runtime_resume_and_get() fails in
> iris_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 <dennylin0707@gmail.com>
> ---
> 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(-)
>
> diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c
> index f5e3341e1430..9059cbe8fe5f 100644
> --- a/drivers/media/platform/qcom/iris/iris_resources.c
> +++ b/drivers/media/platform/qcom/iris/iris_resources.c
> @@ -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;

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.

>  }
>  
>  int iris_disable_power_domains(struct iris_core *core, struct device *pd_dev)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v4 1/2] media: qcom: iris: fix runtime PM reference leaks
  2026-06-07 23:28 ` [PATCH v4 1/2] media: qcom: iris: fix runtime PM reference leaks Hungyu Lin
@ 2026-06-08  7:38   ` Konrad Dybcio
  0 siblings, 0 replies; 5+ messages in thread
From: Konrad Dybcio @ 2026-06-08  7:38 UTC (permalink / raw)
  To: Hungyu Lin, linux-media
  Cc: linux-arm-msm, linux-kernel, vikash.garodia, abhinav.kumar, bod,
	mchehab, hverkuil, stefan.schmidt, Dmitry Baryshkov

On 6/8/26 1:28 AM, Hungyu Lin wrote:
> 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.
> 
> Fixes: bb8a95aa038e ("media: iris: implement power management")
> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> Signed-off-by: Hungyu Lin <dennylin0707@gmail.com>
> ---
> 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(-)
> 
> diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c
> index 773f6548370a..f5e3341e1430 100644
> --- a/drivers/media/platform/qcom/iris/iris_resources.c
> +++ b/drivers/media/platform/qcom/iris/iris_resources.c
> @@ -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;
>  }

"return pm_runtime_resume_and_get(pd_dev)"

>  
>  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;

put_sync() can fail too

Konrad

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2026-06-08  7:38 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-07 23:28 [PATCH v4 0/2] media: qcom: iris: fix runtime PM reference handling Hungyu Lin
2026-06-07 23:28 ` [PATCH v4 1/2] media: qcom: iris: fix runtime PM reference leaks Hungyu Lin
2026-06-08  7:38   ` Konrad Dybcio
2026-06-07 23:28 ` [PATCH v4 2/2] media: qcom: iris: rollback OPP vote on PM resume failure Hungyu Lin
2026-06-08  6:29   ` Vishnu Reddy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®