Hi Tommaso,
Thank you for the patch.
On Wed, Dec 20, 2023 at 09:56:09AM +0100, Tommaso Merciai wrote:
> Use the newly added storage for frame interval in the subdev state to
> simplify the driver.
>
> Signed-off-by: Tommaso Merciai <tomm.merciai@xxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> Changes Since v1:
> - Removed FIXME comment and active state check into alvium_s_frame_interval
> as suggested by LPinchart.
> - Fixed call alvium_set_frame_rate() only for active state into alvium_s_frame_interval
> as suggested by LPinchart.
>
> drivers/media/i2c/alvium-csi2.c | 51 +++++++++++----------------------
> drivers/media/i2c/alvium-csi2.h | 1 -
> 2 files changed, 16 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/media/i2c/alvium-csi2.c b/drivers/media/i2c/alvium-csi2.c
> index b234d74454bf..240bf991105e 100644
> --- a/drivers/media/i2c/alvium-csi2.c
> +++ b/drivers/media/i2c/alvium-csi2.c
> @@ -1641,42 +1641,16 @@ static int alvium_hw_init(struct alvium_dev *alvium)
> }
>
> /* --------------- Subdev Operations --------------- */
> -
> -static int alvium_g_frame_interval(struct v4l2_subdev *sd,
> - struct v4l2_subdev_state *sd_state,
> - struct v4l2_subdev_frame_interval *fi)
> -{
> - struct alvium_dev *alvium = sd_to_alvium(sd);
> -
> - /*
> - * FIXME: Implement support for V4L2_SUBDEV_FORMAT_TRY, using the V4L2
> - * subdev active state API.
> - */
> - if (fi->which != V4L2_SUBDEV_FORMAT_ACTIVE)
> - return -EINVAL;
> -
> - fi->interval = alvium->frame_interval;
> -
> - return 0;
> -}
> -
> static int alvium_s_frame_interval(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *sd_state,
> struct v4l2_subdev_frame_interval *fi)
> {
> struct alvium_dev *alvium = sd_to_alvium(sd);
> struct device *dev = &alvium->i2c_client->dev;
> - u64 req_fr = ALVIUM_DEFAULT_FR_HZ;
> - u64 dft_fr, min_fr, max_fr;
> + u64 req_fr, dft_fr, min_fr, max_fr;
> + struct v4l2_fract *interval;
> int ret;
>
> - /*
> - * FIXME: Implement support for V4L2_SUBDEV_FORMAT_TRY, using the V4L2
> - * subdev active state API.
> - */
> - if (fi->which != V4L2_SUBDEV_FORMAT_ACTIVE)
> - return -EINVAL;
> -
> if (alvium->streaming)
> return -EBUSY;
>
> @@ -1700,8 +1674,13 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd,
> if (req_fr >= max_fr && req_fr <= min_fr)
> req_fr = dft_fr;
>
> - alvium->frame_interval.numerator = fi->interval.numerator;
> - alvium->frame_interval.denominator = fi->interval.denominator;
> + interval = v4l2_subdev_state_get_interval(sd_state, 0);
> +
> + interval->numerator = fi->interval.numerator;
> + interval->denominator = fi->interval.denominator;
> +
> + if (fi->which != V4L2_SUBDEV_FORMAT_ACTIVE)
> + return 0;
>
> return alvium_set_frame_rate(alvium, req_fr);
> }
> @@ -1851,6 +1830,7 @@ static int alvium_init_state(struct v4l2_subdev *sd,
> {
> struct alvium_dev *alvium = sd_to_alvium(sd);
> struct alvium_mode *mode = &alvium->mode;
> + struct v4l2_fract *interval;
> struct v4l2_subdev_format sd_fmt = {
> .which = V4L2_SUBDEV_FORMAT_TRY,
> .format = alvium_csi2_default_fmt,
> @@ -1868,6 +1848,11 @@ static int alvium_init_state(struct v4l2_subdev *sd,
> *v4l2_subdev_state_get_crop(state, 0) = sd_crop.rect;
> *v4l2_subdev_state_get_format(state, 0) = sd_fmt.format;
>
> + /* Setup initial frame interval*/
> + interval = v4l2_subdev_state_get_interval(state, 0);
> + interval->numerator = 1;
> + interval->denominator = ALVIUM_DEFAULT_FR_HZ;
> +
> return 0;
> }
>
> @@ -2237,7 +2222,7 @@ static const struct v4l2_subdev_pad_ops alvium_pad_ops = {
> .set_fmt = alvium_set_fmt,
> .get_selection = alvium_get_selection,
> .set_selection = alvium_set_selection,
> - .get_frame_interval = alvium_g_frame_interval,
> + .get_frame_interval = v4l2_subdev_get_frame_interval,
> .set_frame_interval = alvium_s_frame_interval,
> };
>
> @@ -2258,10 +2243,6 @@ static int alvium_subdev_init(struct alvium_dev *alvium)
> struct v4l2_subdev *sd = &alvium->sd;
> int ret;
>
> - /* Setup initial frame interval*/
> - alvium->frame_interval.numerator = 1;
> - alvium->frame_interval.denominator = ALVIUM_DEFAULT_FR_HZ;
> -
> /* Setup the initial mode */
> alvium->mode.fmt = alvium_csi2_default_fmt;
> alvium->mode.width = alvium_csi2_default_fmt.width;
> diff --git a/drivers/media/i2c/alvium-csi2.h b/drivers/media/i2c/alvium-csi2.h
> index 80066ac25047..9463f8604fbc 100644
> --- a/drivers/media/i2c/alvium-csi2.h
> +++ b/drivers/media/i2c/alvium-csi2.h
> @@ -442,7 +442,6 @@ struct alvium_dev {
> s32 inc_sharp;
>
> struct alvium_mode mode;
> - struct v4l2_fract frame_interval;
>
> u8 h_sup_csi_lanes;
> u64 link_freq;
--
Regards,
Laurent Pinchart
