| Message ID | 20230324151228.2778112-8-paul.kocialkowski@bootlin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: sun6i-csi/isp: Implement MC I/O support | expand |
Dne petek, 24. marec 2023 ob 16:12:26 CET je Paul Kocialkowski napisal(a): > Report available frame sizes as a continuous range between the > hardware min/max limits. > > Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > Co-authored-by: Adam Pigg <adam@piggz.co.uk> > Signed-off-by: Adam Pigg <adam@piggz.co.uk> Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com> Best regards, Jernej
Hi Paul, Thank you for the patch. On Fri, Mar 24, 2023 at 04:12:26PM +0100, Paul Kocialkowski wrote: > Report available frame sizes as a continuous range between the > hardware min/max limits. > > Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > Co-authored-by: Adam Pigg <adam@piggz.co.uk> > Signed-off-by: Adam Pigg <adam@piggz.co.uk> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > .../sunxi/sun6i-csi/sun6i_csi_capture.c | 26 +++++++++++++++++++ > 1 file changed, 26 insertions(+) > > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c > index 9627030ff060..31ba83014086 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c > @@ -847,6 +847,30 @@ static int sun6i_csi_capture_try_fmt(struct file *file, void *private, > return 0; > } > > +static int > +sun6i_csi_capture_enum_framesizes(struct file *file, void *fh, > + struct v4l2_frmsizeenum *frmsizeenum) > +{ > + const struct sun6i_csi_capture_format *format; > + > + if (frmsizeenum->index > 0) > + return -EINVAL; > + > + format = sun6i_csi_capture_format_find(frmsizeenum->pixel_format); > + if (!format) > + return -EINVAL; > + > + frmsizeenum->type = V4L2_FRMSIZE_TYPE_CONTINUOUS; > + frmsizeenum->stepwise.min_width = SUN6I_CSI_CAPTURE_WIDTH_MIN; > + frmsizeenum->stepwise.max_width = SUN6I_CSI_CAPTURE_WIDTH_MAX; > + frmsizeenum->stepwise.min_height = SUN6I_CSI_CAPTURE_HEIGHT_MIN; > + frmsizeenum->stepwise.max_height = SUN6I_CSI_CAPTURE_HEIGHT_MAX; > + frmsizeenum->stepwise.step_width = 1; > + frmsizeenum->stepwise.step_height = 1; > + > + return 0; > +} > + > static int sun6i_csi_capture_enum_input(struct file *file, void *private, > struct v4l2_input *input) > { > @@ -884,6 +908,8 @@ static const struct v4l2_ioctl_ops sun6i_csi_capture_ioctl_ops = { > .vidioc_s_fmt_vid_cap = sun6i_csi_capture_s_fmt, > .vidioc_try_fmt_vid_cap = sun6i_csi_capture_try_fmt, > > + .vidioc_enum_framesizes = sun6i_csi_capture_enum_framesizes, > + > .vidioc_enum_input = sun6i_csi_capture_enum_input, > .vidioc_g_input = sun6i_csi_capture_g_input, > .vidioc_s_input = sun6i_csi_capture_s_input,
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c index 9627030ff060..31ba83014086 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c @@ -847,6 +847,30 @@ static int sun6i_csi_capture_try_fmt(struct file *file, void *private, return 0; } +static int +sun6i_csi_capture_enum_framesizes(struct file *file, void *fh, + struct v4l2_frmsizeenum *frmsizeenum) +{ + const struct sun6i_csi_capture_format *format; + + if (frmsizeenum->index > 0) + return -EINVAL; + + format = sun6i_csi_capture_format_find(frmsizeenum->pixel_format); + if (!format) + return -EINVAL; + + frmsizeenum->type = V4L2_FRMSIZE_TYPE_CONTINUOUS; + frmsizeenum->stepwise.min_width = SUN6I_CSI_CAPTURE_WIDTH_MIN; + frmsizeenum->stepwise.max_width = SUN6I_CSI_CAPTURE_WIDTH_MAX; + frmsizeenum->stepwise.min_height = SUN6I_CSI_CAPTURE_HEIGHT_MIN; + frmsizeenum->stepwise.max_height = SUN6I_CSI_CAPTURE_HEIGHT_MAX; + frmsizeenum->stepwise.step_width = 1; + frmsizeenum->stepwise.step_height = 1; + + return 0; +} + static int sun6i_csi_capture_enum_input(struct file *file, void *private, struct v4l2_input *input) { @@ -884,6 +908,8 @@ static const struct v4l2_ioctl_ops sun6i_csi_capture_ioctl_ops = { .vidioc_s_fmt_vid_cap = sun6i_csi_capture_s_fmt, .vidioc_try_fmt_vid_cap = sun6i_csi_capture_try_fmt, + .vidioc_enum_framesizes = sun6i_csi_capture_enum_framesizes, + .vidioc_enum_input = sun6i_csi_capture_enum_input, .vidioc_g_input = sun6i_csi_capture_g_input, .vidioc_s_input = sun6i_csi_capture_s_input,