From: Hungyu Lin <dennylin0707@gmail.com>
To: vikash.garodia@oss.qualcomm.com, dikshita.agarwal@oss.qualcomm.com
Cc: abhinav.kumar@linux.dev, bod@kernel.org, mchehab@kernel.org,
dmitry.baryshkov@oss.qualcomm.com,
konrad.dybcio@oss.qualcomm.com, busanna.reddy@oss.qualcomm.com,
linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org, Hungyu Lin <dennylin0707@gmail.com>
Subject: [PATCH v5 2/2] media: qcom: iris: rollback OPP vote on PM resume failure
Date: Mon, 8 Jun 2026 08:17:21 +0000 [thread overview]
Message-ID: <20260608081721.82846-3-dennylin0707@gmail.com> (raw)
In-Reply-To: <20260608081721.82846-1-dennylin0707@gmail.com>
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>
---
drivers/media/platform/qcom/iris/iris_resources.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c
index 6d3339423eec..3e18c6998f92 100644
--- a/drivers/media/platform/qcom/iris/iris_resources.c
+++ b/drivers/media/platform/qcom/iris/iris_resources.c
@@ -78,7 +78,16 @@ int iris_enable_power_domains(struct iris_core *core, struct device *pd_dev)
if (ret)
return ret;
- return pm_runtime_resume_and_get(pd_dev);
+ ret = pm_runtime_resume_and_get(pd_dev);
+ if (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
prev parent reply other threads:[~2026-06-08 8:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-08 8:17 [PATCH v5 0/2] media: qcom: iris: fix runtime PM error handling Hungyu Lin
2026-06-08 8:17 ` [PATCH v5 1/2] media: qcom: iris: fix runtime PM reference leaks Hungyu Lin
2026-06-08 8:17 ` Hungyu Lin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260608081721.82846-3-dennylin0707@gmail.com \
--to=dennylin0707@gmail.com \
--cc=abhinav.kumar@linux.dev \
--cc=bod@kernel.org \
--cc=busanna.reddy@oss.qualcomm.com \
--cc=dikshita.agarwal@oss.qualcomm.com \
--cc=dmitry.baryshkov@oss.qualcomm.com \
--cc=konrad.dybcio@oss.qualcomm.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=vikash.garodia@oss.qualcomm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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®