| Message ID | 20210330173348.30135-11-p.yadav@ti.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | CSI2RX support on J721E | expand |
Hi Pratyush, Thank you for the patch. On Tue, Mar 30, 2021 at 11:03:42PM +0530, Pratyush Yadav wrote: > When this bridge driver is being user by another platform driver, it > might want to call subdev operations like getting format, setting > format, enumerating format codes, etc. Add wrapper functions that pass > that call through to the sensor. > > Currently wrappers are added only for the ops used by TI's platform > driver. More can be added later as needed. This isn't the direction we want to take. For new platforms, propagation of subdev configuration should be handled by userspace, using the V4L2 userspace subdev API. This subdev should not call any subdev operation from its source other than .s_stream(). > Signed-off-by: Pratyush Yadav <p.yadav@ti.com> > --- > drivers/media/platform/cadence/cdns-csi2rx.c | 77 ++++++++++++++++++++ > 1 file changed, 77 insertions(+) > > diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c > index 3385e1bc213e..2e8bbc53cb8b 100644 > --- a/drivers/media/platform/cadence/cdns-csi2rx.c > +++ b/drivers/media/platform/cadence/cdns-csi2rx.c > @@ -408,12 +408,89 @@ static int csi2rx_s_stream(struct v4l2_subdev *subdev, int enable) > return ret; > } > > +static int csi2rx_g_frame_interval(struct v4l2_subdev *subdev, > + struct v4l2_subdev_frame_interval *fi) > +{ > + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); > + > + return v4l2_subdev_call(csi2rx->source_subdev, video, g_frame_interval, > + fi); > +} > + > +static int csi2rx_s_frame_interval(struct v4l2_subdev *subdev, > + struct v4l2_subdev_frame_interval *fi) > +{ > + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); > + > + return v4l2_subdev_call(csi2rx->source_subdev, video, s_frame_interval, > + fi); > +} > + > +static int csi2rx_enum_mbus_code(struct v4l2_subdev *subdev, > + struct v4l2_subdev_pad_config *cfg, > + struct v4l2_subdev_mbus_code_enum *code) > +{ > + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); > + > + return v4l2_subdev_call(csi2rx->source_subdev, pad, enum_mbus_code, > + cfg, code); > +} > + > +static int csi2rx_get_fmt(struct v4l2_subdev *subdev, > + struct v4l2_subdev_pad_config *cfg, > + struct v4l2_subdev_format *fmt) > +{ > + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); > + > + return v4l2_subdev_call(csi2rx->source_subdev, pad, get_fmt, cfg, fmt); > +} > + > +static int csi2rx_set_fmt(struct v4l2_subdev *subdev, > + struct v4l2_subdev_pad_config *cfg, > + struct v4l2_subdev_format *fmt) > +{ > + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); > + > + return v4l2_subdev_call(csi2rx->source_subdev, pad, set_fmt, cfg, fmt); > +} > + > +static int csi2rx_enum_frame_size(struct v4l2_subdev *subdev, > + struct v4l2_subdev_pad_config *cfg, > + struct v4l2_subdev_frame_size_enum *fse) > +{ > + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); > + > + return v4l2_subdev_call(csi2rx->source_subdev, pad, enum_frame_size, > + cfg, fse); > +} > + > +static int csi2rx_enum_frame_interval(struct v4l2_subdev *subdev, > + struct v4l2_subdev_pad_config *cfg, > + struct v4l2_subdev_frame_interval_enum *fie) > +{ > + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); > + > + return v4l2_subdev_call(csi2rx->source_subdev, pad, enum_frame_interval, > + cfg, fie); > +} > + > static const struct v4l2_subdev_video_ops csi2rx_video_ops = { > .s_stream = csi2rx_s_stream, > + .g_frame_interval = csi2rx_g_frame_interval, > + .s_frame_interval = csi2rx_s_frame_interval, > +}; > + > +static const struct v4l2_subdev_pad_ops csi2rx_pad_ops = { > + .enum_mbus_code = csi2rx_enum_mbus_code, > + .get_fmt = csi2rx_get_fmt, > + .set_fmt = csi2rx_set_fmt, > + .enum_frame_size = csi2rx_enum_frame_size, > + .enum_frame_interval = csi2rx_enum_frame_interval, > }; > > static const struct v4l2_subdev_ops csi2rx_subdev_ops = { > .video = &csi2rx_video_ops, > + .pad = &csi2rx_pad_ops, > }; > > static int csi2rx_async_bound(struct v4l2_async_notifier *notifier,
On 02/04/21 01:47PM, Laurent Pinchart wrote: > Hi Pratyush, > > Thank you for the patch. Thank you for the review :-) > > On Tue, Mar 30, 2021 at 11:03:42PM +0530, Pratyush Yadav wrote: > > When this bridge driver is being user by another platform driver, it > > might want to call subdev operations like getting format, setting > > format, enumerating format codes, etc. Add wrapper functions that pass > > that call through to the sensor. > > > > Currently wrappers are added only for the ops used by TI's platform > > driver. More can be added later as needed. > > This isn't the direction we want to take. For new platforms, propagation > of subdev configuration should be handled by userspace, using the V4L2 > userspace subdev API. This subdev should not call any subdev operation > from its source other than .s_stream(). Right. I have replied to Tomi's message about this too. Will move the driver to use the media controller API. > > > Signed-off-by: Pratyush Yadav <p.yadav@ti.com> > > --- > > drivers/media/platform/cadence/cdns-csi2rx.c | 77 ++++++++++++++++++++ > > 1 file changed, 77 insertions(+) > > > > diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c > > index 3385e1bc213e..2e8bbc53cb8b 100644 > > --- a/drivers/media/platform/cadence/cdns-csi2rx.c > > +++ b/drivers/media/platform/cadence/cdns-csi2rx.c > > @@ -408,12 +408,89 @@ static int csi2rx_s_stream(struct v4l2_subdev *subdev, int enable) > > return ret; > > } > > > > +static int csi2rx_g_frame_interval(struct v4l2_subdev *subdev, > > + struct v4l2_subdev_frame_interval *fi) > > +{ > > + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); > > + > > + return v4l2_subdev_call(csi2rx->source_subdev, video, g_frame_interval, > > + fi); > > +} > > + > > +static int csi2rx_s_frame_interval(struct v4l2_subdev *subdev, > > + struct v4l2_subdev_frame_interval *fi) > > +{ > > + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); > > + > > + return v4l2_subdev_call(csi2rx->source_subdev, video, s_frame_interval, > > + fi); > > +} > > + > > +static int csi2rx_enum_mbus_code(struct v4l2_subdev *subdev, > > + struct v4l2_subdev_pad_config *cfg, > > + struct v4l2_subdev_mbus_code_enum *code) > > +{ > > + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); > > + > > + return v4l2_subdev_call(csi2rx->source_subdev, pad, enum_mbus_code, > > + cfg, code); > > +} > > + > > +static int csi2rx_get_fmt(struct v4l2_subdev *subdev, > > + struct v4l2_subdev_pad_config *cfg, > > + struct v4l2_subdev_format *fmt) > > +{ > > + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); > > + > > + return v4l2_subdev_call(csi2rx->source_subdev, pad, get_fmt, cfg, fmt); > > +} > > + > > +static int csi2rx_set_fmt(struct v4l2_subdev *subdev, > > + struct v4l2_subdev_pad_config *cfg, > > + struct v4l2_subdev_format *fmt) > > +{ > > + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); > > + > > + return v4l2_subdev_call(csi2rx->source_subdev, pad, set_fmt, cfg, fmt); > > +} > > + > > +static int csi2rx_enum_frame_size(struct v4l2_subdev *subdev, > > + struct v4l2_subdev_pad_config *cfg, > > + struct v4l2_subdev_frame_size_enum *fse) > > +{ > > + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); > > + > > + return v4l2_subdev_call(csi2rx->source_subdev, pad, enum_frame_size, > > + cfg, fse); > > +} > > + > > +static int csi2rx_enum_frame_interval(struct v4l2_subdev *subdev, > > + struct v4l2_subdev_pad_config *cfg, > > + struct v4l2_subdev_frame_interval_enum *fie) > > +{ > > + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); > > + > > + return v4l2_subdev_call(csi2rx->source_subdev, pad, enum_frame_interval, > > + cfg, fie); > > +} > > + > > static const struct v4l2_subdev_video_ops csi2rx_video_ops = { > > .s_stream = csi2rx_s_stream, > > + .g_frame_interval = csi2rx_g_frame_interval, > > + .s_frame_interval = csi2rx_s_frame_interval, > > +}; > > + > > +static const struct v4l2_subdev_pad_ops csi2rx_pad_ops = { > > + .enum_mbus_code = csi2rx_enum_mbus_code, > > + .get_fmt = csi2rx_get_fmt, > > + .set_fmt = csi2rx_set_fmt, > > + .enum_frame_size = csi2rx_enum_frame_size, > > + .enum_frame_interval = csi2rx_enum_frame_interval, > > }; > > > > static const struct v4l2_subdev_ops csi2rx_subdev_ops = { > > .video = &csi2rx_video_ops, > > + .pad = &csi2rx_pad_ops, > > }; > > > > static int csi2rx_async_bound(struct v4l2_async_notifier *notifier, > > -- > Regards, > > Laurent Pinchart
diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c index 3385e1bc213e..2e8bbc53cb8b 100644 --- a/drivers/media/platform/cadence/cdns-csi2rx.c +++ b/drivers/media/platform/cadence/cdns-csi2rx.c @@ -408,12 +408,89 @@ static int csi2rx_s_stream(struct v4l2_subdev *subdev, int enable) return ret; } +static int csi2rx_g_frame_interval(struct v4l2_subdev *subdev, + struct v4l2_subdev_frame_interval *fi) +{ + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); + + return v4l2_subdev_call(csi2rx->source_subdev, video, g_frame_interval, + fi); +} + +static int csi2rx_s_frame_interval(struct v4l2_subdev *subdev, + struct v4l2_subdev_frame_interval *fi) +{ + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); + + return v4l2_subdev_call(csi2rx->source_subdev, video, s_frame_interval, + fi); +} + +static int csi2rx_enum_mbus_code(struct v4l2_subdev *subdev, + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_mbus_code_enum *code) +{ + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); + + return v4l2_subdev_call(csi2rx->source_subdev, pad, enum_mbus_code, + cfg, code); +} + +static int csi2rx_get_fmt(struct v4l2_subdev *subdev, + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_format *fmt) +{ + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); + + return v4l2_subdev_call(csi2rx->source_subdev, pad, get_fmt, cfg, fmt); +} + +static int csi2rx_set_fmt(struct v4l2_subdev *subdev, + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_format *fmt) +{ + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); + + return v4l2_subdev_call(csi2rx->source_subdev, pad, set_fmt, cfg, fmt); +} + +static int csi2rx_enum_frame_size(struct v4l2_subdev *subdev, + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_frame_size_enum *fse) +{ + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); + + return v4l2_subdev_call(csi2rx->source_subdev, pad, enum_frame_size, + cfg, fse); +} + +static int csi2rx_enum_frame_interval(struct v4l2_subdev *subdev, + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_frame_interval_enum *fie) +{ + struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev); + + return v4l2_subdev_call(csi2rx->source_subdev, pad, enum_frame_interval, + cfg, fie); +} + static const struct v4l2_subdev_video_ops csi2rx_video_ops = { .s_stream = csi2rx_s_stream, + .g_frame_interval = csi2rx_g_frame_interval, + .s_frame_interval = csi2rx_s_frame_interval, +}; + +static const struct v4l2_subdev_pad_ops csi2rx_pad_ops = { + .enum_mbus_code = csi2rx_enum_mbus_code, + .get_fmt = csi2rx_get_fmt, + .set_fmt = csi2rx_set_fmt, + .enum_frame_size = csi2rx_enum_frame_size, + .enum_frame_interval = csi2rx_enum_frame_interval, }; static const struct v4l2_subdev_ops csi2rx_subdev_ops = { .video = &csi2rx_video_ops, + .pad = &csi2rx_pad_ops, }; static int csi2rx_async_bound(struct v4l2_async_notifier *notifier,
When this bridge driver is being user by another platform driver, it might want to call subdev operations like getting format, setting format, enumerating format codes, etc. Add wrapper functions that pass that call through to the sensor. Currently wrappers are added only for the ops used by TI's platform driver. More can be added later as needed. Signed-off-by: Pratyush Yadav <p.yadav@ti.com> --- drivers/media/platform/cadence/cdns-csi2rx.c | 77 ++++++++++++++++++++ 1 file changed, 77 insertions(+)