Hi Laurent,
thanks for the update.
Am Samstag, 14. Januar 2023, 18:17:50 CET schrieb Laurent Pinchart:
> Avoid accessing the imx290 current_format and current_mode fields in
> imx290_calc_pixel_rate() to prepare for the removal of those fields.
> Among the two callers of the function, imx290_ctrl_update() has an
> explicit mode pointer already, and we can also give it a format pointer.
> Use those explicitly.
>
> While at it, inline the imx290_get_link_freq() function in
> imx290_calc_pixel_rate() as it is only called there.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> Changes since v1:
>
> - Drop format argument from imx290_calc_pixel_rate()
> ---
> drivers/media/i2c/imx290.c | 27 ++++++++++++---------------
> 1 file changed, 12 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
> index 4ad6eab4f2e2..8f141df74e2f 100644
> --- a/drivers/media/i2c/imx290.c
> +++ b/drivers/media/i2c/imx290.c
> @@ -547,21 +547,15 @@ static int imx290_write_current_format(struct imx290
> *imx290) return 0;
> }
>
> -static s64 imx290_get_link_freq(struct imx290 *imx290)
> +static u64 imx290_calc_pixel_rate(struct imx290 *imx290,
> + const struct v4l2_mbus_framefmt
*format,
Maybe some mishap, but the format parameter is still here.
Otherwise:
Reviewed-by: Alexander Stein <alexander.stein@xxxxxxxxxxxxxxx>
> + const struct imx290_mode *mode)
> {
> - u8 index = imx290->current_mode->link_freq_index;
> -
> - return *(imx290_link_freqs_ptr(imx290) + index);
> -}
> -
> -static u64 imx290_calc_pixel_rate(struct imx290 *imx290)
> -{
> - s64 link_freq = imx290_get_link_freq(imx290);
> - u8 nlanes = imx290->nlanes;
> + s64 link_freq = imx290_link_freqs_ptr(imx290)[mode-
>link_freq_index];
> u64 pixel_rate;
>
> /* pixel rate = link_freq * 2 * nr_of_lanes / bits_per_sample */
> - pixel_rate = link_freq * 2 * nlanes;
> + pixel_rate = link_freq * 2 * imx290->nlanes;
> do_div(pixel_rate, imx290->bpp);
> return pixel_rate;
> }
> @@ -635,6 +629,7 @@ static const char * const imx290_test_pattern_menu[] = {
> };
>
> static void imx290_ctrl_update(struct imx290 *imx290,
> + const struct v4l2_mbus_framefmt *format,
> const struct imx290_mode *mode)
> {
> unsigned int hblank = mode->hmax - mode->width;
> @@ -649,7 +644,7 @@ static void imx290_ctrl_update(struct imx290 *imx290,
>
> __v4l2_ctrl_s_ctrl(imx290->link_freq, mode->link_freq_index);
> __v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate,
> - imx290_calc_pixel_rate(imx290));
> + imx290_calc_pixel_rate(imx290,
format, mode));
>
> __v4l2_ctrl_modify_range(imx290->hblank, hblank, hblank, 1, hblank);
> __v4l2_ctrl_modify_range(imx290->vblank, vblank, vblank, 1, vblank);
> @@ -659,6 +654,7 @@ static int imx290_ctrl_init(struct imx290 *imx290)
> {
> struct v4l2_fwnode_device_properties props;
> unsigned int blank;
> + u64 pixel_rate;
> int ret;
>
> ret = v4l2_fwnode_device_parse(imx290->dev, &props);
> @@ -696,10 +692,11 @@ static int imx290_ctrl_init(struct imx290 *imx290)
> if (imx290->link_freq)
> imx290->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
>
> + pixel_rate = imx290_calc_pixel_rate(imx290, &imx290->current_format,
> + imx290->current_mode);
> imx290->pixel_rate = v4l2_ctrl_new_std(&imx290->ctrls,
&imx290_ctrl_ops,
> V4L2_CID_PIXEL_RATE,
> - 1, INT_MAX, 1,
> -
imx290_calc_pixel_rate(imx290));
> + 1, INT_MAX, 1,
pixel_rate);
>
> v4l2_ctrl_new_std_menu_items(&imx290->ctrls, &imx290_ctrl_ops,
> V4L2_CID_TEST_PATTERN,
> @@ -920,7 +917,7 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,
> imx290->current_mode = mode;
> imx290->bpp = imx290_formats[i].bpp;
>
> - imx290_ctrl_update(imx290, mode);
> + imx290_ctrl_update(imx290, &fmt->format, mode);
> }
>
> *format = fmt->format;
