[v2,6/7] media: i2c: imx219: Simplify format assignment
Commit Message
The set_fmt and init_cfg functions both fills a v4l2_mbus_framefmt
instance, passing in the mode and the media bus code. While set_fmt
uses function helpers, init_cfg open-codes the assignments.
Simplify the format initialization by moving it to a common helper.
Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/media/i2c/imx219.c | 48 ++++++++++++++------------------------
1 file changed, 18 insertions(+), 30 deletions(-)
Comments
Hi Jacopo,
On 7/10/23 9:22 PM, Jacopo Mondi wrote:
> The set_fmt and init_cfg functions both fills a v4l2_mbus_framefmt
> instance, passing in the mode and the media bus code. While set_fmt
> uses function helpers, init_cfg open-codes the assignments.
>
> Simplify the format initialization by moving it to a common helper.
>
> Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
> ---
> drivers/media/i2c/imx219.c | 48 ++++++++++++++------------------------
> 1 file changed, 18 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
> index 73e06583d651..4f214f10846c 100644
> --- a/drivers/media/i2c/imx219.c
> +++ b/drivers/media/i2c/imx219.c
> @@ -670,6 +670,20 @@ static const struct v4l2_ctrl_ops imx219_ctrl_ops = {
> .s_ctrl = imx219_set_ctrl,
> };
>
> +static void imx219_update_pad_format(struct imx219 *imx219,
> + const struct imx219_mode *mode,
> + struct v4l2_mbus_framefmt *fmt, u32 code)
> +{
> + /* Bayer order varies with flips */
> + fmt->code = imx219_get_format_code(imx219, code);
> + fmt->width = mode->width;
> + fmt->height = mode->height;
> + fmt->field = V4L2_FIELD_NONE;
> + fmt->colorspace = V4L2_COLORSPACE_RAW;
> + fmt->quantization = V4L2_QUANTIZATION_FULL_RANGE;
> + fmt->xfer_func = V4L2_XFER_FUNC_NONE;
> +}
> +
> static int imx219_init_cfg(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *state)
> {
> @@ -679,15 +693,8 @@ static int imx219_init_cfg(struct v4l2_subdev *sd,
>
> /* Initialize try_fmt */
> format = v4l2_subdev_get_pad_format(sd, state, 0);
> - format->width = supported_modes[0].width;
> - format->height = supported_modes[0].height;
> - format->code = imx219_get_format_code(imx219,
> - MEDIA_BUS_FMT_SRGGB10_1X10);
> - format->field = V4L2_FIELD_NONE;
> - format->colorspace = V4L2_COLORSPACE_RAW;
> - format->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(format->colorspace);
> - format->quantization = V4L2_QUANTIZATION_FULL_RANGE;
> - format->xfer_func = V4L2_XFER_FUNC_NONE;
> + imx219_update_pad_format(imx219, &supported_modes[0], format,
> + MEDIA_BUS_FMT_SRGGB10_1X10);
>
> /* Initialize crop rectangle. */
> crop = v4l2_subdev_get_pad_crop(sd, state, 0);
> @@ -735,23 +742,6 @@ static int imx219_enum_frame_size(struct v4l2_subdev *sd,
> return 0;
> }
>
> -static void imx219_reset_colorspace(struct v4l2_mbus_framefmt *fmt)
> -{
> - fmt->colorspace = V4L2_COLORSPACE_RAW;
> - fmt->quantization = V4L2_QUANTIZATION_FULL_RANGE;
> - fmt->xfer_func = V4L2_XFER_FUNC_NONE;
> -}
> -
> -static void imx219_update_pad_format(struct imx219 *imx219,
> - const struct imx219_mode *mode,
> - struct v4l2_subdev_format *fmt)
> -{
> - fmt->format.width = mode->width;
> - fmt->format.height = mode->height;
> - fmt->format.field = V4L2_FIELD_NONE;
> - imx219_reset_colorspace(&fmt->format);
> -}
> -
> static int imx219_set_pad_format(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *sd_state,
> struct v4l2_subdev_format *fmt)
> @@ -768,15 +758,13 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd,
> if (i >= ARRAY_SIZE(imx219_mbus_formats))
> i = 0;
>
> - /* Bayer order varies with flips */
> - fmt->format.code = imx219_get_format_code(imx219, imx219_mbus_formats[i]);
> -
> mode = v4l2_find_nearest_size(supported_modes,
> ARRAY_SIZE(supported_modes),
> width, height,
> fmt->format.width, fmt->format.height);
>
> - imx219_update_pad_format(imx219, mode, fmt);
> + imx219_update_pad_format(imx219, mode, &fmt->format,
> + imx219_mbus_formats[i]);
> format = v4l2_subdev_get_pad_format(sd, sd_state, 0);
>
> if (imx219->mode == mode && format->code == fmt->format.code)
@@ -670,6 +670,20 @@ static const struct v4l2_ctrl_ops imx219_ctrl_ops = {
.s_ctrl = imx219_set_ctrl,
};
+static void imx219_update_pad_format(struct imx219 *imx219,
+ const struct imx219_mode *mode,
+ struct v4l2_mbus_framefmt *fmt, u32 code)
+{
+ /* Bayer order varies with flips */
+ fmt->code = imx219_get_format_code(imx219, code);
+ fmt->width = mode->width;
+ fmt->height = mode->height;
+ fmt->field = V4L2_FIELD_NONE;
+ fmt->colorspace = V4L2_COLORSPACE_RAW;
+ fmt->quantization = V4L2_QUANTIZATION_FULL_RANGE;
+ fmt->xfer_func = V4L2_XFER_FUNC_NONE;
+}
+
static int imx219_init_cfg(struct v4l2_subdev *sd,
struct v4l2_subdev_state *state)
{
@@ -679,15 +693,8 @@ static int imx219_init_cfg(struct v4l2_subdev *sd,
/* Initialize try_fmt */
format = v4l2_subdev_get_pad_format(sd, state, 0);
- format->width = supported_modes[0].width;
- format->height = supported_modes[0].height;
- format->code = imx219_get_format_code(imx219,
- MEDIA_BUS_FMT_SRGGB10_1X10);
- format->field = V4L2_FIELD_NONE;
- format->colorspace = V4L2_COLORSPACE_RAW;
- format->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(format->colorspace);
- format->quantization = V4L2_QUANTIZATION_FULL_RANGE;
- format->xfer_func = V4L2_XFER_FUNC_NONE;
+ imx219_update_pad_format(imx219, &supported_modes[0], format,
+ MEDIA_BUS_FMT_SRGGB10_1X10);
/* Initialize crop rectangle. */
crop = v4l2_subdev_get_pad_crop(sd, state, 0);
@@ -735,23 +742,6 @@ static int imx219_enum_frame_size(struct v4l2_subdev *sd,
return 0;
}
-static void imx219_reset_colorspace(struct v4l2_mbus_framefmt *fmt)
-{
- fmt->colorspace = V4L2_COLORSPACE_RAW;
- fmt->quantization = V4L2_QUANTIZATION_FULL_RANGE;
- fmt->xfer_func = V4L2_XFER_FUNC_NONE;
-}
-
-static void imx219_update_pad_format(struct imx219 *imx219,
- const struct imx219_mode *mode,
- struct v4l2_subdev_format *fmt)
-{
- fmt->format.width = mode->width;
- fmt->format.height = mode->height;
- fmt->format.field = V4L2_FIELD_NONE;
- imx219_reset_colorspace(&fmt->format);
-}
-
static int imx219_set_pad_format(struct v4l2_subdev *sd,
struct v4l2_subdev_state *sd_state,
struct v4l2_subdev_format *fmt)
@@ -768,15 +758,13 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd,
if (i >= ARRAY_SIZE(imx219_mbus_formats))
i = 0;
- /* Bayer order varies with flips */
- fmt->format.code = imx219_get_format_code(imx219, imx219_mbus_formats[i]);
-
mode = v4l2_find_nearest_size(supported_modes,
ARRAY_SIZE(supported_modes),
width, height,
fmt->format.width, fmt->format.height);
- imx219_update_pad_format(imx219, mode, fmt);
+ imx219_update_pad_format(imx219, mode, &fmt->format,
+ imx219_mbus_formats[i]);
format = v4l2_subdev_get_pad_format(sd, sd_state, 0);
if (imx219->mode == mode && format->code == fmt->format.code)