From: Eugen Hristev <eugen.hristev@microchip.com> To: <linux-media@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org> Cc: <jacopo@jmondi.org>, <laurent.pinchart@ideasonboard.com>, <sakari.ailus@iki.fi>, <robh+dt@kernel.org>, <nicolas.ferre@microchip.com>, Eugen Hristev <eugen.hristev@microchip.com> Subject: [PATCH 10/21] media: atmel: atmel-isc-base: report frame sizes as full supported range Date: Fri, 22 Oct 2021 10:52:36 +0300 [thread overview] Message-ID: <20211022075247.518880-11-eugen.hristev@microchip.com> (raw) In-Reply-To: <20211022075247.518880-1-eugen.hristev@microchip.com> The ISC supports a full broad range of frame sizes. Until now, the subdevice was queried for possible frame sizes and these were reported to the user space. However, the ISC should not care about which frame sizes the subdev supports, as long as this frame size is supported. Thus, report a continuous range from smallest frame size up to the max resolution. Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com> --- drivers/media/platform/atmel/atmel-isc-base.c | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c index 8537ad73d160..2dd2511c7be1 100644 --- a/drivers/media/platform/atmel/atmel-isc-base.c +++ b/drivers/media/platform/atmel/atmel-isc-base.c @@ -1077,14 +1077,12 @@ static int isc_enum_framesizes(struct file *file, void *fh, struct v4l2_frmsizeenum *fsize) { struct isc_device *isc = video_drvdata(file); - struct v4l2_subdev_frame_size_enum fse = { - .code = isc->config.sd_format->mbus_code, - .index = fsize->index, - .which = V4L2_SUBDEV_FORMAT_ACTIVE, - }; int ret = -EINVAL; int i; + if (fsize->index) + return -EINVAL; + for (i = 0; i < isc->num_user_formats; i++) if (isc->user_formats[i]->fourcc == fsize->pixel_format) ret = 0; @@ -1096,14 +1094,14 @@ static int isc_enum_framesizes(struct file *file, void *fh, if (ret) return ret; - ret = v4l2_subdev_call(isc->current_subdev->sd, pad, enum_frame_size, - NULL, &fse); - if (ret) - return ret; + fsize->type = V4L2_FRMSIZE_TYPE_CONTINUOUS; - fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE; - fsize->discrete.width = fse.max_width; - fsize->discrete.height = fse.max_height; + fsize->stepwise.min_width = 16; + fsize->stepwise.max_width = isc->max_width; + fsize->stepwise.min_height = 16; + fsize->stepwise.max_height = isc->max_height; + fsize->stepwise.step_width = 1; + fsize->stepwise.step_height = 1; return 0; } -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Eugen Hristev <eugen.hristev@microchip.com> To: <linux-media@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org> Cc: jacopo@jmondi.org, robh+dt@kernel.org, sakari.ailus@iki.fi, laurent.pinchart@ideasonboard.com, Eugen Hristev <eugen.hristev@microchip.com> Subject: [PATCH 10/21] media: atmel: atmel-isc-base: report frame sizes as full supported range Date: Fri, 22 Oct 2021 10:52:36 +0300 [thread overview] Message-ID: <20211022075247.518880-11-eugen.hristev@microchip.com> (raw) In-Reply-To: <20211022075247.518880-1-eugen.hristev@microchip.com> The ISC supports a full broad range of frame sizes. Until now, the subdevice was queried for possible frame sizes and these were reported to the user space. However, the ISC should not care about which frame sizes the subdev supports, as long as this frame size is supported. Thus, report a continuous range from smallest frame size up to the max resolution. Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com> --- drivers/media/platform/atmel/atmel-isc-base.c | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c index 8537ad73d160..2dd2511c7be1 100644 --- a/drivers/media/platform/atmel/atmel-isc-base.c +++ b/drivers/media/platform/atmel/atmel-isc-base.c @@ -1077,14 +1077,12 @@ static int isc_enum_framesizes(struct file *file, void *fh, struct v4l2_frmsizeenum *fsize) { struct isc_device *isc = video_drvdata(file); - struct v4l2_subdev_frame_size_enum fse = { - .code = isc->config.sd_format->mbus_code, - .index = fsize->index, - .which = V4L2_SUBDEV_FORMAT_ACTIVE, - }; int ret = -EINVAL; int i; + if (fsize->index) + return -EINVAL; + for (i = 0; i < isc->num_user_formats; i++) if (isc->user_formats[i]->fourcc == fsize->pixel_format) ret = 0; @@ -1096,14 +1094,14 @@ static int isc_enum_framesizes(struct file *file, void *fh, if (ret) return ret; - ret = v4l2_subdev_call(isc->current_subdev->sd, pad, enum_frame_size, - NULL, &fse); - if (ret) - return ret; + fsize->type = V4L2_FRMSIZE_TYPE_CONTINUOUS; - fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE; - fsize->discrete.width = fse.max_width; - fsize->discrete.height = fse.max_height; + fsize->stepwise.min_width = 16; + fsize->stepwise.max_width = isc->max_width; + fsize->stepwise.min_height = 16; + fsize->stepwise.max_height = isc->max_height; + fsize->stepwise.step_width = 1; + fsize->stepwise.step_height = 1; return 0; } -- 2.25.1 _______________________________________________ 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:[~2021-10-22 7:54 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-10-22 7:52 [PATCH 00/21] media: atmel: atmel-isc: implement media controller Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-10-22 7:52 ` [PATCH 01/21] MAINTAINERS: add microchip csi2dc Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-10-22 7:52 ` [PATCH 02/21] dt-bindings: media: atmel: csi2dc: add bindings for " Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-10-29 1:57 ` Rob Herring 2021-10-29 1:57 ` Rob Herring 2021-10-22 7:52 ` [PATCH 03/21] media: atmel: introduce microchip csi2dc driver Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-11-02 17:22 ` Jacopo Mondi 2021-11-02 17:22 ` Jacopo Mondi 2021-11-03 8:31 ` Eugen.Hristev 2021-11-03 8:31 ` Eugen.Hristev 2021-11-03 9:28 ` Jacopo Mondi 2021-11-03 9:28 ` Jacopo Mondi 2021-11-03 9:59 ` Eugen.Hristev 2021-11-03 9:59 ` Eugen.Hristev 2021-11-03 10:59 ` Jacopo Mondi 2021-11-03 10:59 ` Jacopo Mondi 2021-11-11 10:05 ` Eugen.Hristev 2021-11-11 10:05 ` Eugen.Hristev 2021-10-22 7:52 ` [PATCH 04/21] MAINTAINERS: atmel-isc: add new file atmel-isc-clk.c Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-10-22 7:52 ` [PATCH 05/21] media: atmel: atmel-isc: split the clock code into separate source file Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-11-05 9:02 ` Jacopo Mondi 2021-11-05 9:02 ` Jacopo Mondi 2021-11-05 9:13 ` Eugen.Hristev 2021-11-05 9:13 ` Eugen.Hristev 2021-10-22 7:52 ` [PATCH 06/21] media: atmel: atmel-isc: replace video device name with module name Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-11-05 9:14 ` Jacopo Mondi 2021-11-05 9:14 ` Jacopo Mondi 2021-10-22 7:52 ` [PATCH 07/21] media: atmel: atmel-sama7g5-isc: fix ispck leftover Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-11-05 9:15 ` Jacopo Mondi 2021-11-05 9:15 ` Jacopo Mondi 2021-10-22 7:52 ` [PATCH 08/21] media: atmel: atmel-isc-base: use streaming status when queueing buffers Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-11-05 9:18 ` Jacopo Mondi 2021-11-05 9:18 ` Jacopo Mondi 2021-10-22 7:52 ` [PATCH 09/21] media: atmel: atmel-isc-base: remove frameintervals VIDIOC Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-11-05 9:23 ` Jacopo Mondi 2021-11-05 9:23 ` Jacopo Mondi 2021-10-22 7:52 ` Eugen Hristev [this message] 2021-10-22 7:52 ` [PATCH 10/21] media: atmel: atmel-isc-base: report frame sizes as full supported range Eugen Hristev 2021-11-05 9:52 ` Jacopo Mondi 2021-11-05 9:52 ` Jacopo Mondi 2021-10-22 7:52 ` [PATCH 11/21] media: atmel: atmel-isc-base: implement mbus_code support in enumfmt Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-11-05 9:25 ` Jacopo Mondi 2021-11-05 9:25 ` Jacopo Mondi 2021-11-05 9:51 ` Jacopo Mondi 2021-11-05 9:51 ` Jacopo Mondi 2021-11-05 11:03 ` Eugen.Hristev 2021-11-05 11:03 ` Eugen.Hristev 2021-11-08 11:20 ` Jacopo Mondi 2021-11-08 11:20 ` Jacopo Mondi 2021-11-08 14:08 ` Eugen.Hristev 2021-11-08 14:08 ` Eugen.Hristev 2021-11-11 9:49 ` Eugen.Hristev 2021-11-11 9:49 ` Eugen.Hristev 2021-10-22 7:52 ` [PATCH 12/21] media: atmel: atmel-isc-base: fix bytesperline value for planar formats Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-10-22 7:52 ` [PATCH 13/21] MAINTAINERS: atmel-isc: add new file atmel-isc-mc.c Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-10-22 7:52 ` [PATCH 14/21] media: atmel: atmel-isc: implement media controller Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-10-22 7:52 ` [PATCH 15/21] ARM: dts: at91: sama7g5: add nodes for video capture Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-10-22 7:52 ` [PATCH 16/21] ARM: configs: at91: sama7: add xisc and csi2dc Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-10-22 7:52 ` [PATCH 17/21] ARM: multi_v7_defconfig: add atmel video pipeline modules Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-10-22 7:52 ` [PATCH 18/21] media: atmel: atmel-sama5d2-isc: fix wrong mask in YUYV format check Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-10-22 7:52 ` [PATCH 19/21] media: atmel: atmel-isc-base: use mutex to lock awb workqueue from streaming Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-10-22 7:52 ` [PATCH 20/21] media: atmel: atmel-isc-base: add wb debug messages Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev 2021-10-22 7:52 ` [PATCH 21/21] media: atmel: atmel-isc-base: clamp wb gain coefficients Eugen Hristev 2021-10-22 7:52 ` Eugen Hristev
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=20211022075247.518880-11-eugen.hristev@microchip.com \ --to=eugen.hristev@microchip.com \ --cc=devicetree@vger.kernel.org \ --cc=jacopo@jmondi.org \ --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=nicolas.ferre@microchip.com \ --cc=robh+dt@kernel.org \ --cc=sakari.ailus@iki.fi \ /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.