UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: camss: Do vfe_get/vfe_put for csid on sm8250 

The sm8250 CAMSS CSID depends on the VFE it is attached to being powered on
and clocked prior to taking the CSID out of reset.

It is possible to open just the CSID subdev from libcamera and attempt to
bring the CSID block up.

If we do not first bring up the VFE the CSID will fail to come out of
reset.

Tested-by: Julian Grahsl <jgrahsl@snap.com>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: Robert Foss <robert.foss@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Bryan O'Donoghue 2021-12-22 01:37:50 +01:00 committed by Mauro Carvalho Chehab
parent 5ba38efb26
commit c5af8db84c
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/platform/qcom/camss/camss-csid.c
View File

@ -156,10 +156,18 @@ static int csid_set_clock_rates(struct csid_device *csid)
static int csid_set_power(struct v4l2_subdev *sd, int on)
{
struct csid_device *csid = v4l2_get_subdevdata(sd);
struct device *dev = csid->camss->dev;
struct camss *camss = csid->camss;
struct device *dev = camss->dev;
struct vfe_device *vfe = &camss->vfe[csid->id];
int ret;
if (on) {
if (camss->version == CAMSS_8250) {
ret = vfe_get(vfe);
if (ret < 0)
return ret;
}
ret = pm_runtime_resume_and_get(dev);
if (ret < 0)
return ret;
@ -204,6 +212,8 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
camss_disable_clocks(csid->nclocks, csid->clock);
ret = csid->vdda ? regulator_disable(csid->vdda) : 0;
pm_runtime_put_sync(dev);
if (camss->version == CAMSS_8250)
vfe_put(vfe);
}
return ret;

4
drivers/media/platform/qcom/camss/camss-vfe.c
View File

@ -575,7 +575,7 @@ static int vfe_check_clock_rates(struct vfe_device *vfe)
*
* Return 0 on success or a negative error code otherwise
*/
static int vfe_get(struct vfe_device *vfe)
int vfe_get(struct vfe_device *vfe)
{
int ret;
@ -637,7 +637,7 @@ error_pm_domain:
* vfe_put - Power down VFE module
* @vfe: VFE Device
*/
static void vfe_put(struct vfe_device *vfe)
void vfe_put(struct vfe_device *vfe)
{
mutex_lock(&vfe->power_lock);

3
drivers/media/platform/qcom/camss/camss-vfe.h
View File

@ -203,4 +203,7 @@ extern const struct vfe_hw_ops vfe_ops_4_8;
extern const struct vfe_hw_ops vfe_ops_170;
extern const struct vfe_hw_ops vfe_ops_480;
int vfe_get(struct vfe_device *vfe);
void vfe_put(struct vfe_device *vfe);
#endif /* QC_MSM_CAMSS_VFE_H */