From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
To: rfoss@kernel.org, todor.too@gmail.com,
bryan.odonoghue@linaro.org, agross@kernel.org,
andersson@kernel.org, konrad.dybcio@linaro.org,
mchehab@kernel.org, hverkuil-cisco@xs4all.nl,
sakari.ailus@linux.intel.com, andrey.konovalov@linaro.org
Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: [PATCH v0 1/9] media: qcom: camss: Fix pm_domain_on sequence in probe
Date: Mon, 14 Aug 2023 15:09:59 +0100 [thread overview]
Message-ID: <20230814141007.3721197-2-bryan.odonoghue@linaro.org> (raw)
In-Reply-To: <20230814141007.3721197-1-bryan.odonoghue@linaro.org>
We need to make sure camss_configure_pd() happens before
camss_register_entities() as the vfe_get() path relies on the pointer
provided by camss_configure_pd().
Fix the ordering sequence in probe to ensure the pointers vfe_get() demands
are present by the time camss_register_entities() runs.
In order to facilitate backporting to stable kernels I've moved the
configure_pd() call pretty early on the probe() function so that
irrespective of the existence of the old error handling jump labels this
patch should still apply to -next circa Aug 2023 to v5.13 inclusive.
Fixes: 2f6f8af67203 ("media: camss: Refactor VFE power domain toggling")
Cc: stable@vger.kernel.org
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
drivers/media/platform/qcom/camss/camss.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index f11dc59135a5a..75991d849b571 100644
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -1619,6 +1619,12 @@ static int camss_probe(struct platform_device *pdev)
if (ret < 0)
goto err_cleanup;
+ ret = camss_configure_pd(camss);
+ if (ret < 0) {
+ dev_err(dev, "Failed to configure power domains: %d\n", ret);
+ goto err_cleanup;
+ }
+
ret = camss_init_subdevices(camss);
if (ret < 0)
goto err_cleanup;
@@ -1678,12 +1684,6 @@ static int camss_probe(struct platform_device *pdev)
}
}
- ret = camss_configure_pd(camss);
- if (ret < 0) {
- dev_err(dev, "Failed to configure power domains: %d\n", ret);
- return ret;
- }
-
pm_runtime_enable(dev);
return 0;
--
2.41.0
next prev parent reply other threads:[~2023-08-14 14:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-14 14:09 [PATCH v0 0/9] media: qcom: camss: Bugfix series Bryan O'Donoghue
2023-08-14 14:09 ` Bryan O'Donoghue [this message]
2023-08-14 14:10 ` [PATCH v0 2/9] media: qcom: camss: Fix V4L2 async notifier error path Bryan O'Donoghue
2023-08-14 14:10 ` [PATCH v0 3/9] media: qcom: camss: Fix vfe_get() error jump Bryan O'Donoghue
2023-08-14 14:10 ` [PATCH v0 4/9] media: qcom: camss: Fix VFE-17x vfe_disable_output() Bryan O'Donoghue
2023-08-14 14:10 ` [PATCH v0 5/9] media: qcom: camss: Fix VFE-480 vfe_disable_output() Bryan O'Donoghue
2023-08-14 14:10 ` [PATCH v0 6/9] media: qcom: camss: Fix missing vfe_lite clocks check Bryan O'Donoghue
2023-08-14 14:10 ` [PATCH v0 7/9] media: qcom: camss: Fix invalid clock enable bit disjunction Bryan O'Donoghue
2023-08-21 11:56 ` Konrad Dybcio
2023-08-14 14:10 ` [PATCH v0 8/9] media: qcom: camss: Fix set CSI2_RX_CFG1_VC_MODE when VC is greater than 3 Bryan O'Donoghue
2023-08-21 9:53 ` Hans Verkuil
2023-08-21 10:13 ` Bryan O'Donoghue
2023-08-21 18:51 ` Bryan O'Donoghue
2023-08-21 19:21 ` Bryan O'Donoghue
2023-08-14 14:10 ` [PATCH v0 9/9] media: qcom: camss: Fix csid-gen2 for test pattern generator Bryan O'Donoghue
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=20230814141007.3721197-2-bryan.odonoghue@linaro.org \
--to=bryan.odonoghue@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=andrey.konovalov@linaro.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=konrad.dybcio@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=rfoss@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=stable@vger.kernel.org \
--cc=todor.too@gmail.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;
as well as URLs for NNTP newsgroup(s).