Hi Dave,
On Wed, Oct 05, 2022 at 04:27:58PM +0100, Dave Stevenson wrote:
> The driver currently has multiple assumptions that there is
> only one supported mode.
>
> Convert supported_mode to an array, and fix up all references
> to correctly look at that array.
>
> Signed-off-by: Dave Stevenson <dave.stevenson@xxxxxxxxxxxxxxx>
> ---
> drivers/media/i2c/ov9282.c | 44 ++++++++++++++++++++++----------------
> 1 file changed, 26 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/media/i2c/ov9282.c b/drivers/media/i2c/ov9282.c
> index 798ff8ba50bd..f7823d584522 100644
> --- a/drivers/media/i2c/ov9282.c
> +++ b/drivers/media/i2c/ov9282.c
> @@ -262,20 +262,24 @@ static const struct ov9282_reg mode_1280x720_regs[] = {
> };
>
> /* Supported sensor mode configurations */
> -static const struct ov9282_mode supported_mode = {
> - .width = 1280,
> - .height = 720,
> - .hblank = 250,
> - .vblank = 1022,
> - .vblank_min = 151,
> - .vblank_max = 51540,
> - .link_freq_idx = 0,
> - .reg_list = {
> - .num_of_regs = ARRAY_SIZE(mode_1280x720_regs),
> - .regs = mode_1280x720_regs,
> +static const struct ov9282_mode supported_modes[] = {
> + {
> + .width = 1280,
> + .height = 720,
> + .hblank = 250,
> + .vblank = 1022,
> + .vblank_min = 151,
> + .vblank_max = 51540,
> + .link_freq_idx = 0,
> + .reg_list = {
> + .num_of_regs = ARRAY_SIZE(mode_1280x720_regs),
> + .regs = mode_1280x720_regs,
> + },
> },
> };
>
> +#define OV9282_NUM_MODES ARRAY_SIZE(supported_modes)
I think the code would be cleaner without the additional macro, i.e. always
using ARRAY_SIZE(supported_modes).
> +
> /**
> * to_ov9282() - ov9282 V4L2 sub-device to ov9282 device.
> * @subdev: pointer to ov9282 V4L2 sub-device
> @@ -536,15 +540,15 @@ static int ov9282_enum_frame_size(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *sd_state,
> struct v4l2_subdev_frame_size_enum *fsize)
> {
> - if (fsize->index > 0)
> + if (fsize->index >= OV9282_NUM_MODES)
> return -EINVAL;
>
> if (fsize->code != MEDIA_BUS_FMT_Y10_1X10)
> return -EINVAL;
>
> - fsize->min_width = supported_mode.width;
> + fsize->min_width = supported_modes[fsize->index].width;
> fsize->max_width = fsize->min_width;
> - fsize->min_height = supported_mode.height;
> + fsize->min_height = supported_modes[fsize->index].height;
> fsize->max_height = fsize->min_height;
>
> return 0;
> @@ -619,7 +623,11 @@ static int ov9282_set_pad_format(struct v4l2_subdev *sd,
>
> mutex_lock(&ov9282->mutex);
>
> - mode = &supported_mode;
> + mode = v4l2_find_nearest_size(supported_modes,
> + OV9282_NUM_MODES,
> + width, height,
> + fmt->format.width,
> + fmt->format.height);
> ov9282_fill_pad_format(ov9282, mode, fmt);
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> @@ -652,7 +660,7 @@ static int ov9282_init_pad_cfg(struct v4l2_subdev *sd,
> struct v4l2_subdev_format fmt = { 0 };
>
> fmt.which = sd_state ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;
> - ov9282_fill_pad_format(ov9282, &supported_mode, &fmt);
> + ov9282_fill_pad_format(ov9282, &supported_modes[0], &fmt);
>
> return ov9282_set_pad_format(sd, sd_state, &fmt);
> }
> @@ -1081,8 +1089,8 @@ static int ov9282_probe(struct i2c_client *client)
> goto error_power_off;
> }
>
> - /* Set default mode to max resolution */
> - ov9282->cur_mode = &supported_mode;
> + /* Set default mode to first mode */
> + ov9282->cur_mode = &supported_modes[0];
> ov9282->vblank = ov9282->cur_mode->vblank;
>
> ret = ov9282_init_controls(ov9282);
--
Kind regards,
Sakari Ailus
