| Message ID | 20201109164934.134919-19-jacopo@jmondi.org |
|---|---|
| State | New |
| Headers | show |
| Series | media: ov5647: Support RaspberryPi Camera Module v1 | expand |
Hi Jacopo, On Mon, Nov 09, 2020 at 05:49:23PM +0100, Jacopo Mondi wrote: > Now that the driver supports more than a single mode, implement the > .set_fmt pad operation and adjust the existing .get_fmt one to report > the currently applied format. > > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> > --- > drivers/media/i2c/ov5647.c | 66 +++++++++++++++++++++++++++++++++++--- > 1 file changed, 62 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c > index c65aacc0e04d3..68eab61d53493 100644 > --- a/drivers/media/i2c/ov5647.c > +++ b/drivers/media/i2c/ov5647.c > @@ -1019,14 +1019,72 @@ static int ov5647_enum_frame_size(struct v4l2_subdev *sd, > return 0; > } > > -static int ov5647_set_get_fmt(struct v4l2_subdev *sd, > +static int ov5647_get_pad_fmt(struct v4l2_subdev *sd, > struct v4l2_subdev_pad_config *cfg, > struct v4l2_subdev_format *format) > { > struct v4l2_mbus_framefmt *fmt = &format->format; > + const struct v4l2_mbus_framefmt *sensor_format; > + struct ov5647 *sensor = to_sensor(sd); > > memset(fmt, 0, sizeof(*fmt)); > - *fmt = OV5647_DEFAULT_FORMAT; > + > + mutex_lock(&sensor->lock); > + switch (format->which) { > + case V4L2_SUBDEV_FORMAT_TRY: > + sensor_format = v4l2_subdev_get_try_format(sd, cfg, format->pad); > + break; > + default: > + sensor_format = &sensor->mode->format; > + break; > + } > + > + *fmt = *sensor_format; > + mutex_unlock(&sensor->lock); > + > + return 0; > +} > + > +static int ov5647_set_pad_fmt(struct v4l2_subdev *sd, > + struct v4l2_subdev_pad_config *cfg, > + struct v4l2_subdev_format *format) > +{ > + struct v4l2_mbus_framefmt *fmt = &format->format; > + const struct ov5647_mode *ov5647_mode_list; > + struct ov5647 *sensor = to_sensor(sd); > + const struct ov5647_mode *mode; > + unsigned int num_modes; > + > + /* > + * Default mbus code MEDIA_BUS_FMT_SBGGR10_1X10 if the requested one > + * is not supported. > + */ > + if (fmt->code == MEDIA_BUS_FMT_SBGGR8_1X8) { > + ov5647_mode_list = ov5647_8bpp_modes; > + num_modes = ARRAY_SIZE(ov5647_8bpp_modes); > + } else { > + ov5647_mode_list = ov5647_10bpp_modes; > + num_modes = ARRAY_SIZE(ov5647_10bpp_modes); > + } It'd be nicer if you could obtain the above information from an array where there's entry for each format. The above checks have a tendency to repeat themselves in a number of places. > + > + mode = v4l2_find_nearest_size(ov5647_mode_list, num_modes, > + format.width, format.height, > + fmt->width, fmt->height); > + > + if (format->which == V4L2_SUBDEV_FORMAT_TRY) { > + mutex_lock(&sensor->lock); > + *v4l2_subdev_get_try_format(sd, cfg, format->pad) = mode->format; > + *fmt = mode->format; > + mutex_unlock(&sensor->lock); > + > + return 0; > + } > + > + /* Update the sensor mode and apply at it at streamon time. */ > + mutex_lock(&sensor->lock); > + sensor->mode = mode; > + *fmt = mode->format; > + mutex_unlock(&sensor->lock); > > return 0; > } > @@ -1071,8 +1129,8 @@ static int ov5647_get_selection(struct v4l2_subdev *sd, > static const struct v4l2_subdev_pad_ops ov5647_subdev_pad_ops = { > .enum_mbus_code = ov5647_enum_mbus_code, > .enum_frame_size = ov5647_enum_frame_size, > - .set_fmt = ov5647_set_get_fmt, > - .get_fmt = ov5647_set_get_fmt, > + .set_fmt = ov5647_set_pad_fmt, > + .get_fmt = ov5647_get_pad_fmt, > .get_selection = ov5647_get_selection, > }; > -- Sakari Ailus
Hi Sakari, On Wed, Nov 18, 2020 at 10:42:35PM +0200, Sakari Ailus wrote: > Hi Jacopo, > > On Mon, Nov 09, 2020 at 05:49:23PM +0100, Jacopo Mondi wrote: > > Now that the driver supports more than a single mode, implement the > > .set_fmt pad operation and adjust the existing .get_fmt one to report > > the currently applied format. > > > > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> > > --- > > drivers/media/i2c/ov5647.c | 66 +++++++++++++++++++++++++++++++++++--- > > 1 file changed, 62 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c > > index c65aacc0e04d3..68eab61d53493 100644 > > --- a/drivers/media/i2c/ov5647.c > > +++ b/drivers/media/i2c/ov5647.c > > @@ -1019,14 +1019,72 @@ static int ov5647_enum_frame_size(struct v4l2_subdev *sd, > > return 0; > > } > > > > -static int ov5647_set_get_fmt(struct v4l2_subdev *sd, > > +static int ov5647_get_pad_fmt(struct v4l2_subdev *sd, > > struct v4l2_subdev_pad_config *cfg, > > struct v4l2_subdev_format *format) > > { > > struct v4l2_mbus_framefmt *fmt = &format->format; > > + const struct v4l2_mbus_framefmt *sensor_format; > > + struct ov5647 *sensor = to_sensor(sd); > > > > memset(fmt, 0, sizeof(*fmt)); > > - *fmt = OV5647_DEFAULT_FORMAT; > > + > > + mutex_lock(&sensor->lock); > > + switch (format->which) { > > + case V4L2_SUBDEV_FORMAT_TRY: > > + sensor_format = v4l2_subdev_get_try_format(sd, cfg, format->pad); > > + break; > > + default: > > + sensor_format = &sensor->mode->format; > > + break; > > + } > > + > > + *fmt = *sensor_format; > > + mutex_unlock(&sensor->lock); > > + > > + return 0; > > +} > > + > > +static int ov5647_set_pad_fmt(struct v4l2_subdev *sd, > > + struct v4l2_subdev_pad_config *cfg, > > + struct v4l2_subdev_format *format) > > +{ > > + struct v4l2_mbus_framefmt *fmt = &format->format; > > + const struct ov5647_mode *ov5647_mode_list; > > + struct ov5647 *sensor = to_sensor(sd); > > + const struct ov5647_mode *mode; > > + unsigned int num_modes; > > + > > + /* > > + * Default mbus code MEDIA_BUS_FMT_SBGGR10_1X10 if the requested one > > + * is not supported. > > + */ > > + if (fmt->code == MEDIA_BUS_FMT_SBGGR8_1X8) { > > + ov5647_mode_list = ov5647_8bpp_modes; > > + num_modes = ARRAY_SIZE(ov5647_8bpp_modes); > > + } else { > > + ov5647_mode_list = ov5647_10bpp_modes; > > + num_modes = ARRAY_SIZE(ov5647_10bpp_modes); > > + } > > It'd be nicer if you could obtain the above information from an array where > there's entry for each format. The above checks have a tendency to repeat > themselves in a number of places. > Indeed I could replace this with a for loop like it's done in enum_frame_sizes... I'll fix > > + > > + mode = v4l2_find_nearest_size(ov5647_mode_list, num_modes, > > + format.width, format.height, > > + fmt->width, fmt->height); > > + > > + if (format->which == V4L2_SUBDEV_FORMAT_TRY) { > > + mutex_lock(&sensor->lock); > > + *v4l2_subdev_get_try_format(sd, cfg, format->pad) = mode->format; > > + *fmt = mode->format; > > + mutex_unlock(&sensor->lock); > > + > > + return 0; > > + } > > + > > + /* Update the sensor mode and apply at it at streamon time. */ > > + mutex_lock(&sensor->lock); > > + sensor->mode = mode; > > + *fmt = mode->format; > > + mutex_unlock(&sensor->lock); > > > > return 0; > > } > > @@ -1071,8 +1129,8 @@ static int ov5647_get_selection(struct v4l2_subdev *sd, > > static const struct v4l2_subdev_pad_ops ov5647_subdev_pad_ops = { > > .enum_mbus_code = ov5647_enum_mbus_code, > > .enum_frame_size = ov5647_enum_frame_size, > > - .set_fmt = ov5647_set_get_fmt, > > - .get_fmt = ov5647_set_get_fmt, > > + .set_fmt = ov5647_set_pad_fmt, > > + .get_fmt = ov5647_get_pad_fmt, > > .get_selection = ov5647_get_selection, > > }; > > > > -- > Sakari Ailus
diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c index c65aacc0e04d3..68eab61d53493 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -1019,14 +1019,72 @@ static int ov5647_enum_frame_size(struct v4l2_subdev *sd, return 0; } -static int ov5647_set_get_fmt(struct v4l2_subdev *sd, +static int ov5647_get_pad_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_format *format) { struct v4l2_mbus_framefmt *fmt = &format->format; + const struct v4l2_mbus_framefmt *sensor_format; + struct ov5647 *sensor = to_sensor(sd); memset(fmt, 0, sizeof(*fmt)); - *fmt = OV5647_DEFAULT_FORMAT; + + mutex_lock(&sensor->lock); + switch (format->which) { + case V4L2_SUBDEV_FORMAT_TRY: + sensor_format = v4l2_subdev_get_try_format(sd, cfg, format->pad); + break; + default: + sensor_format = &sensor->mode->format; + break; + } + + *fmt = *sensor_format; + mutex_unlock(&sensor->lock); + + return 0; +} + +static int ov5647_set_pad_fmt(struct v4l2_subdev *sd, + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_format *format) +{ + struct v4l2_mbus_framefmt *fmt = &format->format; + const struct ov5647_mode *ov5647_mode_list; + struct ov5647 *sensor = to_sensor(sd); + const struct ov5647_mode *mode; + unsigned int num_modes; + + /* + * Default mbus code MEDIA_BUS_FMT_SBGGR10_1X10 if the requested one + * is not supported. + */ + if (fmt->code == MEDIA_BUS_FMT_SBGGR8_1X8) { + ov5647_mode_list = ov5647_8bpp_modes; + num_modes = ARRAY_SIZE(ov5647_8bpp_modes); + } else { + ov5647_mode_list = ov5647_10bpp_modes; + num_modes = ARRAY_SIZE(ov5647_10bpp_modes); + } + + mode = v4l2_find_nearest_size(ov5647_mode_list, num_modes, + format.width, format.height, + fmt->width, fmt->height); + + if (format->which == V4L2_SUBDEV_FORMAT_TRY) { + mutex_lock(&sensor->lock); + *v4l2_subdev_get_try_format(sd, cfg, format->pad) = mode->format; + *fmt = mode->format; + mutex_unlock(&sensor->lock); + + return 0; + } + + /* Update the sensor mode and apply at it at streamon time. */ + mutex_lock(&sensor->lock); + sensor->mode = mode; + *fmt = mode->format; + mutex_unlock(&sensor->lock); return 0; } @@ -1071,8 +1129,8 @@ static int ov5647_get_selection(struct v4l2_subdev *sd, static const struct v4l2_subdev_pad_ops ov5647_subdev_pad_ops = { .enum_mbus_code = ov5647_enum_mbus_code, .enum_frame_size = ov5647_enum_frame_size, - .set_fmt = ov5647_set_get_fmt, - .get_fmt = ov5647_set_get_fmt, + .set_fmt = ov5647_set_pad_fmt, + .get_fmt = ov5647_get_pad_fmt, .get_selection = ov5647_get_selection, };
Now that the driver supports more than a single mode, implement the .set_fmt pad operation and adjust the existing .get_fmt one to report the currently applied format. Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> --- drivers/media/i2c/ov5647.c | 66 +++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 4 deletions(-)