From: Paul Kocialkowski <paul.kocialkowski@bootlin.com> To: linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev Cc: Paul Kocialkowski <paul.kocialkowski@bootlin.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@gmail.com>, Samuel Holland <samuel@sholland.org>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Adam Pigg <adam@piggz.co.uk>, Thomas Petazzoni <thomas.petazzoni@bootlin.com> Subject: [PATCH 9/9] media: sun6i-isp: capture: Implement enum_framesizes Date: Fri, 24 Mar 2023 16:12:28 +0100 [thread overview] Message-ID: <20230324151228.2778112-10-paul.kocialkowski@bootlin.com> (raw) In-Reply-To: <20230324151228.2778112-1-paul.kocialkowski@bootlin.com> 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> --- .../media/sunxi/sun6i-isp/sun6i_isp_capture.c | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c index 5160b93b69ff..a368f90a9beb 100644 --- a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c +++ b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c @@ -487,6 +487,30 @@ static int sun6i_isp_capture_try_fmt(struct file *file, void *private, return 0; } +static int +sun6i_isp_capture_enum_framesizes(struct file *file, void *fh, + struct v4l2_frmsizeenum *frmsizeenum) +{ + const struct sun6i_isp_capture_format *format; + + if (frmsizeenum->index > 0) + return -EINVAL; + + format = sun6i_isp_capture_format_find(frmsizeenum->pixel_format); + if (!format) + return -EINVAL; + + frmsizeenum->type = V4L2_FRMSIZE_TYPE_CONTINUOUS; + frmsizeenum->stepwise.min_width = SUN6I_ISP_CAPTURE_WIDTH_MIN; + frmsizeenum->stepwise.max_width = SUN6I_ISP_CAPTURE_WIDTH_MAX; + frmsizeenum->stepwise.min_height = SUN6I_ISP_CAPTURE_HEIGHT_MIN; + frmsizeenum->stepwise.max_height = SUN6I_ISP_CAPTURE_HEIGHT_MAX; + frmsizeenum->stepwise.step_width = 1; + frmsizeenum->stepwise.step_height = 1; + + return 0; +} + static int sun6i_isp_capture_enum_input(struct file *file, void *private, struct v4l2_input *input) { @@ -524,6 +548,8 @@ static const struct v4l2_ioctl_ops sun6i_isp_capture_ioctl_ops = { .vidioc_s_fmt_vid_cap = sun6i_isp_capture_s_fmt, .vidioc_try_fmt_vid_cap = sun6i_isp_capture_try_fmt, + .vidioc_enum_framesizes = sun6i_isp_capture_enum_framesizes, + .vidioc_enum_input = sun6i_isp_capture_enum_input, .vidioc_g_input = sun6i_isp_capture_g_input, .vidioc_s_input = sun6i_isp_capture_s_input, -- 2.39.2
WARNING: multiple messages have this Message-ID (diff)
From: Paul Kocialkowski <paul.kocialkowski@bootlin.com> To: linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev Cc: Paul Kocialkowski <paul.kocialkowski@bootlin.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@gmail.com>, Samuel Holland <samuel@sholland.org>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Adam Pigg <adam@piggz.co.uk>, Thomas Petazzoni <thomas.petazzoni@bootlin.com> Subject: [PATCH 9/9] media: sun6i-isp: capture: Implement enum_framesizes Date: Fri, 24 Mar 2023 16:12:28 +0100 [thread overview] Message-ID: <20230324151228.2778112-10-paul.kocialkowski@bootlin.com> (raw) In-Reply-To: <20230324151228.2778112-1-paul.kocialkowski@bootlin.com> 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> --- .../media/sunxi/sun6i-isp/sun6i_isp_capture.c | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c index 5160b93b69ff..a368f90a9beb 100644 --- a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c +++ b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c @@ -487,6 +487,30 @@ static int sun6i_isp_capture_try_fmt(struct file *file, void *private, return 0; } +static int +sun6i_isp_capture_enum_framesizes(struct file *file, void *fh, + struct v4l2_frmsizeenum *frmsizeenum) +{ + const struct sun6i_isp_capture_format *format; + + if (frmsizeenum->index > 0) + return -EINVAL; + + format = sun6i_isp_capture_format_find(frmsizeenum->pixel_format); + if (!format) + return -EINVAL; + + frmsizeenum->type = V4L2_FRMSIZE_TYPE_CONTINUOUS; + frmsizeenum->stepwise.min_width = SUN6I_ISP_CAPTURE_WIDTH_MIN; + frmsizeenum->stepwise.max_width = SUN6I_ISP_CAPTURE_WIDTH_MAX; + frmsizeenum->stepwise.min_height = SUN6I_ISP_CAPTURE_HEIGHT_MIN; + frmsizeenum->stepwise.max_height = SUN6I_ISP_CAPTURE_HEIGHT_MAX; + frmsizeenum->stepwise.step_width = 1; + frmsizeenum->stepwise.step_height = 1; + + return 0; +} + static int sun6i_isp_capture_enum_input(struct file *file, void *private, struct v4l2_input *input) { @@ -524,6 +548,8 @@ static const struct v4l2_ioctl_ops sun6i_isp_capture_ioctl_ops = { .vidioc_s_fmt_vid_cap = sun6i_isp_capture_s_fmt, .vidioc_try_fmt_vid_cap = sun6i_isp_capture_try_fmt, + .vidioc_enum_framesizes = sun6i_isp_capture_enum_framesizes, + .vidioc_enum_input = sun6i_isp_capture_enum_input, .vidioc_g_input = sun6i_isp_capture_g_input, .vidioc_s_input = sun6i_isp_capture_s_input, -- 2.39.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-03-24 15:12 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-03-24 15:12 [PATCH 0/9] media: sun6i-csi/isp: Implement MC I/O support Paul Kocialkowski 2023-03-24 15:12 ` Paul Kocialkowski 2023-03-24 15:12 ` [PATCH 1/9] media: v4l2: Add RGB565X pixel format to v4l2 format info Paul Kocialkowski 2023-03-24 15:12 ` Paul Kocialkowski 2023-03-25 7:06 ` Jernej Škrabec 2023-03-25 7:06 ` Jernej Škrabec 2023-03-25 20:59 ` Laurent Pinchart 2023-03-25 20:59 ` Laurent Pinchart 2023-03-24 15:12 ` [PATCH 2/9] media: v4l2: Add NV12_16L16 " Paul Kocialkowski 2023-03-24 15:12 ` Paul Kocialkowski 2023-03-25 7:06 ` Jernej Škrabec 2023-03-25 7:06 ` Jernej Škrabec 2023-03-25 21:01 ` Laurent Pinchart 2023-03-25 21:01 ` Laurent Pinchart 2023-03-31 18:54 ` Nicolas Dufresne 2023-03-31 18:54 ` Nicolas Dufresne 2023-04-05 4:21 ` Laurent Pinchart 2023-04-05 4:21 ` Laurent Pinchart 2023-04-11 13:03 ` Nicolas Dufresne 2023-04-11 13:03 ` Nicolas Dufresne 2023-04-11 15:30 ` Nicolas Dufresne 2023-04-11 15:30 ` Nicolas Dufresne 2023-03-24 15:12 ` [PATCH 3/9] media: v4l2: Introduce compressed pixel encoding definition and helper Paul Kocialkowski 2023-03-24 15:12 ` Paul Kocialkowski 2023-03-25 7:07 ` Jernej Škrabec 2023-03-25 7:07 ` Jernej Škrabec 2023-03-24 15:12 ` [PATCH 4/9] media: v4l2: Add JPEG pixel format to v4l2 format info Paul Kocialkowski 2023-03-24 15:12 ` Paul Kocialkowski 2023-03-25 7:08 ` Jernej Škrabec 2023-03-25 7:08 ` Jernej Škrabec 2023-03-31 19:07 ` Nicolas Dufresne 2023-03-31 19:07 ` Nicolas Dufresne 2023-03-24 15:12 ` [PATCH 5/9] media: sun6i-csi: capture: Rework and separate format validation Paul Kocialkowski 2023-03-24 15:12 ` Paul Kocialkowski 2023-03-25 7:09 ` Jernej Škrabec 2023-03-25 7:09 ` Jernej Škrabec 2023-03-25 21:24 ` Laurent Pinchart 2023-03-25 21:24 ` Laurent Pinchart 2023-03-24 15:12 ` [PATCH 6/9] media: sun6i-csi: capture: Implement MC I/O with extended enum_fmt Paul Kocialkowski 2023-03-24 15:12 ` Paul Kocialkowski 2023-03-25 7:13 ` Jernej Škrabec 2023-03-25 7:13 ` Jernej Škrabec 2023-03-25 21:29 ` Laurent Pinchart 2023-03-25 21:29 ` Laurent Pinchart 2023-03-24 15:12 ` [PATCH 7/9] media: sun6i-csi: capture: Implement enum_framesizes Paul Kocialkowski 2023-03-24 15:12 ` Paul Kocialkowski 2023-03-25 7:13 ` Jernej Škrabec 2023-03-25 7:13 ` Jernej Škrabec 2023-03-25 21:33 ` Laurent Pinchart 2023-03-25 21:33 ` Laurent Pinchart 2023-03-24 15:12 ` [PATCH 8/9] media: sun6i-isp: capture: Implement MC I/O with extended enum_fmt Paul Kocialkowski 2023-03-24 15:12 ` Paul Kocialkowski 2023-03-25 7:14 ` Jernej Škrabec 2023-03-25 7:14 ` Jernej Škrabec 2023-03-25 21:42 ` Laurent Pinchart 2023-03-25 21:42 ` Laurent Pinchart 2023-03-24 15:12 ` Paul Kocialkowski [this message] 2023-03-24 15:12 ` [PATCH 9/9] media: sun6i-isp: capture: Implement enum_framesizes Paul Kocialkowski 2023-03-25 7:14 ` Jernej Škrabec 2023-03-25 7:14 ` Jernej Škrabec
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230324151228.2778112-10-paul.kocialkowski@bootlin.com \ --to=paul.kocialkowski@bootlin.com \ --cc=adam@piggz.co.uk \ --cc=jernej.skrabec@gmail.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-staging@lists.linux.dev \ --cc=linux-sunxi@lists.linux.dev \ --cc=mchehab@kernel.org \ --cc=samuel@sholland.org \ --cc=thomas.petazzoni@bootlin.com \ --cc=wens@csie.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.