[v5,08/11] media: imx219: Switch from open to init_cfg
Commit Message
Use the init_cfg pad level operation instead of the internal subdev
open operation to set default formats on the pads.
While at it, make the imx219_pad_ops more easier to read.
Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
---
drivers/media/i2c/imx219.c | 63 +++++++++++++++-----------------------
1 file changed, 25 insertions(+), 38 deletions(-)
Comments
Hi Jean-Michel,
Thank you for the patch.
On Tue, Feb 08, 2022 at 04:50:24PM +0100, Jean-Michel Hautbois wrote:
> Use the init_cfg pad level operation instead of the internal subdev
> open operation to set default formats on the pads.
> While at it, make the imx219_pad_ops more easier to read.
It could have been useful to explain here why there's a separate
imx219_init_formats() function, as reviewers could wonder. It's clear
when reviewing the next patches though.
> Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
> ---
> drivers/media/i2c/imx219.c | 63 +++++++++++++++-----------------------
> 1 file changed, 25 insertions(+), 38 deletions(-)
>
> diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
> index 74dba5e61201..abcaee15c4a0 100644
> --- a/drivers/media/i2c/imx219.c
> +++ b/drivers/media/i2c/imx219.c
> @@ -685,34 +685,6 @@ static void imx219_set_default_format(struct imx219 *imx219)
> fmt->field = V4L2_FIELD_NONE;
> }
>
> -static int imx219_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
> -{
> - struct imx219 *imx219 = to_imx219(sd);
> - struct v4l2_mbus_framefmt *try_fmt =
> - v4l2_subdev_get_try_format(sd, fh->state, 0);
> - struct v4l2_rect *try_crop;
> -
> - mutex_lock(&imx219->mutex);
> -
> - /* Initialize try_fmt */
> - try_fmt->width = supported_modes[0].width;
> - try_fmt->height = supported_modes[0].height;
> - try_fmt->code = imx219_get_format_code(imx219,
> - MEDIA_BUS_FMT_SRGGB10_1X10);
> - try_fmt->field = V4L2_FIELD_NONE;
> -
> - /* Initialize try_crop rectangle. */
> - try_crop = v4l2_subdev_get_try_crop(sd, fh->state, 0);
> - try_crop->top = IMX219_PIXEL_ARRAY_TOP;
> - try_crop->left = IMX219_PIXEL_ARRAY_LEFT;
> - try_crop->width = IMX219_PIXEL_ARRAY_WIDTH;
> - try_crop->height = IMX219_PIXEL_ARRAY_HEIGHT;
The crop rectangle initialization is removed here, but not added below.
> -
> - mutex_unlock(&imx219->mutex);
> -
> - return 0;
> -}
> -
> static int imx219_set_ctrl(struct v4l2_ctrl *ctrl)
> {
> struct imx219 *imx219 =
> @@ -802,6 +774,25 @@ static const struct v4l2_ctrl_ops imx219_ctrl_ops = {
> .s_ctrl = imx219_set_ctrl,
> };
>
> +static void imx219_init_formats(struct v4l2_subdev_state *state)
> +{
> + struct v4l2_mbus_framefmt *format;
> +
> + format = v4l2_state_get_stream_format(state, 0, 0);
> + format->code = imx219_mbus_formats[0];
> + format->width = supported_modes[0].width;
> + format->height = supported_modes[0].height;
> + format->field = V4L2_FIELD_NONE;
> + format->colorspace = V4L2_COLORSPACE_RAW;
> +}
> +
> +static int imx219_init_cfg(struct v4l2_subdev *sd,
> + struct v4l2_subdev_state *state)
> +{
> + imx219_init_formats(state);
> + return 0;
> +}
> +
> static int imx219_enum_mbus_code(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *sd_state,
> struct v4l2_subdev_mbus_code_enum *code)
> @@ -1255,11 +1246,12 @@ static const struct v4l2_subdev_video_ops imx219_video_ops = {
> };
>
> static const struct v4l2_subdev_pad_ops imx219_pad_ops = {
> - .enum_mbus_code = imx219_enum_mbus_code,
> - .get_fmt = imx219_get_pad_format,
> - .set_fmt = imx219_set_pad_format,
> - .get_selection = imx219_get_selection,
> - .enum_frame_size = imx219_enum_frame_size,
> + .init_cfg = imx219_init_cfg,
> + .enum_mbus_code = imx219_enum_mbus_code,
> + .get_fmt = imx219_get_pad_format,
> + .set_fmt = imx219_set_pad_format,
> + .get_selection = imx219_get_selection,
> + .enum_frame_size = imx219_enum_frame_size,
> };
>
> static const struct v4l2_subdev_ops imx219_subdev_ops = {
> @@ -1268,10 +1260,6 @@ static const struct v4l2_subdev_ops imx219_subdev_ops = {
> .pad = &imx219_pad_ops,
> };
>
> -static const struct v4l2_subdev_internal_ops imx219_internal_ops = {
> - .open = imx219_open,
> -};
> -
> /* Initialize control handlers */
> static int imx219_init_controls(struct imx219 *imx219)
> {
> @@ -1520,7 +1508,6 @@ static int imx219_probe(struct i2c_client *client)
> goto error_power_off;
>
> /* Initialize subdev */
> - imx219->sd.internal_ops = &imx219_internal_ops;
> imx219->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
> V4L2_SUBDEV_FL_HAS_EVENTS;
> imx219->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
On Tue, Feb 08, 2022 at 06:02:50PM +0200, Laurent Pinchart wrote:
> Hi Jean-Michel,
>
> Thank you for the patch.
>
> On Tue, Feb 08, 2022 at 04:50:24PM +0100, Jean-Michel Hautbois wrote:
> > Use the init_cfg pad level operation instead of the internal subdev
> > open operation to set default formats on the pads.
> > While at it, make the imx219_pad_ops more easier to read.
>
> It could have been useful to explain here why there's a separate
> imx219_init_formats() function, as reviewers could wonder. It's clear
> when reviewing the next patches though.
>
> > Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
> > ---
> > drivers/media/i2c/imx219.c | 63 +++++++++++++++-----------------------
> > 1 file changed, 25 insertions(+), 38 deletions(-)
> >
> > diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
> > index 74dba5e61201..abcaee15c4a0 100644
> > --- a/drivers/media/i2c/imx219.c
> > +++ b/drivers/media/i2c/imx219.c
> > @@ -685,34 +685,6 @@ static void imx219_set_default_format(struct imx219 *imx219)
> > fmt->field = V4L2_FIELD_NONE;
> > }
> >
> > -static int imx219_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
> > -{
> > - struct imx219 *imx219 = to_imx219(sd);
> > - struct v4l2_mbus_framefmt *try_fmt =
> > - v4l2_subdev_get_try_format(sd, fh->state, 0);
> > - struct v4l2_rect *try_crop;
> > -
> > - mutex_lock(&imx219->mutex);
> > -
> > - /* Initialize try_fmt */
> > - try_fmt->width = supported_modes[0].width;
> > - try_fmt->height = supported_modes[0].height;
> > - try_fmt->code = imx219_get_format_code(imx219,
> > - MEDIA_BUS_FMT_SRGGB10_1X10);
> > - try_fmt->field = V4L2_FIELD_NONE;
> > -
> > - /* Initialize try_crop rectangle. */
> > - try_crop = v4l2_subdev_get_try_crop(sd, fh->state, 0);
> > - try_crop->top = IMX219_PIXEL_ARRAY_TOP;
> > - try_crop->left = IMX219_PIXEL_ARRAY_LEFT;
> > - try_crop->width = IMX219_PIXEL_ARRAY_WIDTH;
> > - try_crop->height = IMX219_PIXEL_ARRAY_HEIGHT;
>
> The crop rectangle initialization is removed here, but not added below.
>
> > -
> > - mutex_unlock(&imx219->mutex);
> > -
> > - return 0;
> > -}
> > -
> > static int imx219_set_ctrl(struct v4l2_ctrl *ctrl)
> > {
> > struct imx219 *imx219 =
> > @@ -802,6 +774,25 @@ static const struct v4l2_ctrl_ops imx219_ctrl_ops = {
> > .s_ctrl = imx219_set_ctrl,
> > };
> >
> > +static void imx219_init_formats(struct v4l2_subdev_state *state)
> > +{
> > + struct v4l2_mbus_framefmt *format;
> > +
> > + format = v4l2_state_get_stream_format(state, 0, 0);
Also, this won't work until you create routes. The function will return
NULL and you'll crash. This is fixed in subsequent patches, but it
breaks bisection.
> > + format->code = imx219_mbus_formats[0];
> > + format->width = supported_modes[0].width;
> > + format->height = supported_modes[0].height;
> > + format->field = V4L2_FIELD_NONE;
> > + format->colorspace = V4L2_COLORSPACE_RAW;
> > +}
> > +
> > +static int imx219_init_cfg(struct v4l2_subdev *sd,
> > + struct v4l2_subdev_state *state)
> > +{
> > + imx219_init_formats(state);
> > + return 0;
> > +}
> > +
> > static int imx219_enum_mbus_code(struct v4l2_subdev *sd,
> > struct v4l2_subdev_state *sd_state,
> > struct v4l2_subdev_mbus_code_enum *code)
> > @@ -1255,11 +1246,12 @@ static const struct v4l2_subdev_video_ops imx219_video_ops = {
> > };
> >
> > static const struct v4l2_subdev_pad_ops imx219_pad_ops = {
> > - .enum_mbus_code = imx219_enum_mbus_code,
> > - .get_fmt = imx219_get_pad_format,
> > - .set_fmt = imx219_set_pad_format,
> > - .get_selection = imx219_get_selection,
> > - .enum_frame_size = imx219_enum_frame_size,
> > + .init_cfg = imx219_init_cfg,
> > + .enum_mbus_code = imx219_enum_mbus_code,
> > + .get_fmt = imx219_get_pad_format,
> > + .set_fmt = imx219_set_pad_format,
> > + .get_selection = imx219_get_selection,
> > + .enum_frame_size = imx219_enum_frame_size,
> > };
> >
> > static const struct v4l2_subdev_ops imx219_subdev_ops = {
> > @@ -1268,10 +1260,6 @@ static const struct v4l2_subdev_ops imx219_subdev_ops = {
> > .pad = &imx219_pad_ops,
> > };
> >
> > -static const struct v4l2_subdev_internal_ops imx219_internal_ops = {
> > - .open = imx219_open,
> > -};
> > -
> > /* Initialize control handlers */
> > static int imx219_init_controls(struct imx219 *imx219)
> > {
> > @@ -1520,7 +1508,6 @@ static int imx219_probe(struct i2c_client *client)
> > goto error_power_off;
> >
> > /* Initialize subdev */
> > - imx219->sd.internal_ops = &imx219_internal_ops;
> > imx219->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
> > V4L2_SUBDEV_FL_HAS_EVENTS;
> > imx219->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
>
> --
> Regards,
>
> Laurent Pinchart
@@ -685,34 +685,6 @@ static void imx219_set_default_format(struct imx219 *imx219)
fmt->field = V4L2_FIELD_NONE;
}
-static int imx219_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
-{
- struct imx219 *imx219 = to_imx219(sd);
- struct v4l2_mbus_framefmt *try_fmt =
- v4l2_subdev_get_try_format(sd, fh->state, 0);
- struct v4l2_rect *try_crop;
-
- mutex_lock(&imx219->mutex);
-
- /* Initialize try_fmt */
- try_fmt->width = supported_modes[0].width;
- try_fmt->height = supported_modes[0].height;
- try_fmt->code = imx219_get_format_code(imx219,
- MEDIA_BUS_FMT_SRGGB10_1X10);
- try_fmt->field = V4L2_FIELD_NONE;
-
- /* Initialize try_crop rectangle. */
- try_crop = v4l2_subdev_get_try_crop(sd, fh->state, 0);
- try_crop->top = IMX219_PIXEL_ARRAY_TOP;
- try_crop->left = IMX219_PIXEL_ARRAY_LEFT;
- try_crop->width = IMX219_PIXEL_ARRAY_WIDTH;
- try_crop->height = IMX219_PIXEL_ARRAY_HEIGHT;
-
- mutex_unlock(&imx219->mutex);
-
- return 0;
-}
-
static int imx219_set_ctrl(struct v4l2_ctrl *ctrl)
{
struct imx219 *imx219 =
@@ -802,6 +774,25 @@ static const struct v4l2_ctrl_ops imx219_ctrl_ops = {
.s_ctrl = imx219_set_ctrl,
};
+static void imx219_init_formats(struct v4l2_subdev_state *state)
+{
+ struct v4l2_mbus_framefmt *format;
+
+ format = v4l2_state_get_stream_format(state, 0, 0);
+ format->code = imx219_mbus_formats[0];
+ format->width = supported_modes[0].width;
+ format->height = supported_modes[0].height;
+ format->field = V4L2_FIELD_NONE;
+ format->colorspace = V4L2_COLORSPACE_RAW;
+}
+
+static int imx219_init_cfg(struct v4l2_subdev *sd,
+ struct v4l2_subdev_state *state)
+{
+ imx219_init_formats(state);
+ return 0;
+}
+
static int imx219_enum_mbus_code(struct v4l2_subdev *sd,
struct v4l2_subdev_state *sd_state,
struct v4l2_subdev_mbus_code_enum *code)
@@ -1255,11 +1246,12 @@ static const struct v4l2_subdev_video_ops imx219_video_ops = {
};
static const struct v4l2_subdev_pad_ops imx219_pad_ops = {
- .enum_mbus_code = imx219_enum_mbus_code,
- .get_fmt = imx219_get_pad_format,
- .set_fmt = imx219_set_pad_format,
- .get_selection = imx219_get_selection,
- .enum_frame_size = imx219_enum_frame_size,
+ .init_cfg = imx219_init_cfg,
+ .enum_mbus_code = imx219_enum_mbus_code,
+ .get_fmt = imx219_get_pad_format,
+ .set_fmt = imx219_set_pad_format,
+ .get_selection = imx219_get_selection,
+ .enum_frame_size = imx219_enum_frame_size,
};
static const struct v4l2_subdev_ops imx219_subdev_ops = {
@@ -1268,10 +1260,6 @@ static const struct v4l2_subdev_ops imx219_subdev_ops = {
.pad = &imx219_pad_ops,
};
-static const struct v4l2_subdev_internal_ops imx219_internal_ops = {
- .open = imx219_open,
-};
-
/* Initialize control handlers */
static int imx219_init_controls(struct imx219 *imx219)
{
@@ -1520,7 +1508,6 @@ static int imx219_probe(struct i2c_client *client)
goto error_power_off;
/* Initialize subdev */
- imx219->sd.internal_ops = &imx219_internal_ops;
imx219->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
V4L2_SUBDEV_FL_HAS_EVENTS;
imx219->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;