[git:media_stage/master] media: qcom: camss: Remove special case for VFE get/put
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: qcom: camss: Remove special case for VFE get/put
Author: Bryan O'Donoghue
Date:Mon Sep 25 16:46:59 2023 +0100
>From sdm845 onwards we need to ensure the VFE is powered on prior to
switching on the CSID.
Currently the code tests for sdm845, sm8250 and then does get/set. This is
not extensible and it turns out is not necessary either since vfe_get and
vfe_set reference count.
Remove the over-conservative SoC version check.
Signed-off-by: Bryan O'Donoghue
Suggested-by: Laurent Pinchart
Tested-by: Bryan O'Donoghue # rb3 # db410c
Reviewed-by: Laurent Pinchart
Signed-off-by: Hans Verkuil
drivers/media/platform/qcom/camss/camss-csid.c | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/drivers/media/platform/qcom/camss/camss-csid.c
b/drivers/media/platform/qcom/camss/camss-csid.c
index 99f651e2021c..95873f988f7e 100644
--- a/drivers/media/platform/qcom/camss/camss-csid.c
+++ b/drivers/media/platform/qcom/camss/camss-csid.c
@@ -159,15 +159,17 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
struct camss *camss = csid->camss;
struct device *dev = camss->dev;
struct vfe_device *vfe = >vfe[csid->id];
- u32 version = camss->res->version;
int ret = 0;
if (on) {
- if (version == CAMSS_8250 || version == CAMSS_845) {
- ret = vfe_get(vfe);
- if (ret < 0)
- return ret;
- }
+ /*
+* From SDM845 onwards, the VFE needs to be powered on before
+* switching on the CSID. Do so unconditionally, as there is no
+* drawback in following the same powering order on older SoCs.
+*/
+ ret = vfe_get(vfe);
+ if (ret < 0)
+ return ret;
ret = pm_runtime_resume_and_get(dev);
if (ret < 0)
@@ -217,8 +219,7 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
regulator_bulk_disable(csid->num_supplies,
csid->supplies);
pm_runtime_put_sync(dev);
- if (version == CAMSS_8250 || version == CAMSS_845)
- vfe_put(vfe);
+ vfe_put(vfe);
}
return ret;
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_stage/master] media: qcom: camss: Remove special case for VFE get/put
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: qcom: camss: Remove special case for VFE get/put
Author: Bryan O'Donoghue
Date:Mon Sep 25 16:46:59 2023 +0100
>From sdm845 onwards we need to ensure the VFE is powered on prior to
switching on the CSID.
Currently the code tests for sdm845, sm8250 and then does get/set. This is
not extensible and it turns out is not necessary either since vfe_get and
vfe_set reference count.
Remove the over-conservative SoC version check.
Signed-off-by: Bryan O'Donoghue
Suggested-by: Laurent Pinchart
Tested-by: Bryan O'Donoghue # rb3 # db410c
Reviewed-by: Laurent Pinchart
Signed-off-by: Hans Verkuil
drivers/media/platform/qcom/camss/camss-csid.c | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/drivers/media/platform/qcom/camss/camss-csid.c
b/drivers/media/platform/qcom/camss/camss-csid.c
index 99f651e2021c..95873f988f7e 100644
--- a/drivers/media/platform/qcom/camss/camss-csid.c
+++ b/drivers/media/platform/qcom/camss/camss-csid.c
@@ -159,15 +159,17 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
struct camss *camss = csid->camss;
struct device *dev = camss->dev;
struct vfe_device *vfe = >vfe[csid->id];
- u32 version = camss->res->version;
int ret = 0;
if (on) {
- if (version == CAMSS_8250 || version == CAMSS_845) {
- ret = vfe_get(vfe);
- if (ret < 0)
- return ret;
- }
+ /*
+* From SDM845 onwards, the VFE needs to be powered on before
+* switching on the CSID. Do so unconditionally, as there is no
+* drawback in following the same powering order on older SoCs.
+*/
+ ret = vfe_get(vfe);
+ if (ret < 0)
+ return ret;
ret = pm_runtime_resume_and_get(dev);
if (ret < 0)
@@ -217,8 +219,7 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
regulator_bulk_disable(csid->num_supplies,
csid->supplies);
pm_runtime_put_sync(dev);
- if (version == CAMSS_8250 || version == CAMSS_845)
- vfe_put(vfe);
+ vfe_put(vfe);
}
return ret;
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
