From: Helen Koike <helen.koike@collabora.com>
To: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>,
linux-media@vger.kernel.org
Cc: laurent.pinchart@ideasonboard.com, ezequiel@collabora.com,
hverkuil@xs4all.nl, kernel@collabora.com, dafna3@gmail.com,
sakari.ailus@linux.intel.com, linux-rockchip@lists.infradead.org,
mchehab@kernel.org, tfiga@chromium.org
Subject: Re: [PATCH v4 06/10] media: staging: rkisp1: add a helper function to enumerate supported mbus formats on capture
Date: Mon, 7 Sep 2020 11:19:19 -0300 [thread overview]
Message-ID: <a275c902-4dda-a06b-fc11-1acb40115ca2@collabora.com> (raw)
In-Reply-To: <20200901111612.10552-7-dafna.hirschfeld@collabora.com>
On 9/1/20 8:16 AM, Dafna Hirschfeld wrote:
> Add a function 'rkisp1_cap_enum_mbus_codes' that receive
> a pointer to 'v4l2_subdev_mbus_code_enum' and returns the
> next supported mbus format of the capture. The function
> assumes that pixel formats with identical 'mbus' are grouped
> together in the hardcoded arrays, therefore the order of the
> entries in the array 'rkisp1_sp_fmts' are adjusted.
> This function is a helper for the media bus enumeration of
> the source pad of the resizer entity.
>
> Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
> ---
> drivers/staging/media/rkisp1/rkisp1-capture.c | 86 +++++++++++++------
> drivers/staging/media/rkisp1/rkisp1-common.h | 11 +++
> 2 files changed, 70 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
> index d23c9adc8201..531381e1801a 100644
> --- a/drivers/staging/media/rkisp1/rkisp1-capture.c
> +++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
> @@ -84,6 +84,10 @@ struct rkisp1_capture_config {
> } mi;
> };
>
> +/*
> + * The supported pixel formats for mainpath. NOTE, pixel formats with identical 'mbus'
> + * are grouped together. This is assumed and used by the function rkisp1_cap_enum_mbus_codes
> + */
> static const struct rkisp1_capture_fmt_cfg rkisp1_mp_fmts[] = {
> /* yuv422 */
> {
> @@ -112,6 +116,13 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_mp_fmts[] = {
> .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8,
> .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
> },
> + /* yuv400 */
> + {
> + .fourcc = V4L2_PIX_FMT_GREY,
> + .uv_swap = 0,
> + .write_format = RKISP1_MI_CTRL_MP_WRITE_YUVINT,
> + .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
> + },
> /* yuv420 */
> {
> .fourcc = V4L2_PIX_FMT_NV21,
> @@ -144,13 +155,6 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_mp_fmts[] = {
> .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8,
> .mbus = MEDIA_BUS_FMT_YUYV8_1_5X8,
> },
> - /* yuv400 */
> - {
> - .fourcc = V4L2_PIX_FMT_GREY,
> - .uv_swap = 0,
> - .write_format = RKISP1_MI_CTRL_MP_WRITE_YUVINT,
> - .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
> - },
> /* raw */
> {
> .fourcc = V4L2_PIX_FMT_SRGGB8,
> @@ -203,6 +207,10 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_mp_fmts[] = {
> },
> };
>
> +/*
> + * The supported pixel formats for selfpath. NOTE, pixel formats with identical 'mbus'
> + * are grouped together. This is assumed and used by the function rkisp1_cap_enum_mbus_codes
> + */
> static const struct rkisp1_capture_fmt_cfg rkisp1_sp_fmts[] = {
> /* yuv422 */
> {
> @@ -236,6 +244,26 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_sp_fmts[] = {
> .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV422,
> .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
> },
> + /* yuv400 */
> + {
> + .fourcc = V4L2_PIX_FMT_GREY,
> + .uv_swap = 0,
> + .write_format = RKISP1_MI_CTRL_SP_WRITE_INT,
> + .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV400,
> + .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
> + },
> + /* rgb */
> + {
> + .fourcc = V4L2_PIX_FMT_XBGR32,
> + .write_format = RKISP1_MI_CTRL_SP_WRITE_PLA,
> + .output_format = RKISP1_MI_CTRL_SP_OUTPUT_RGB888,
> + .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
> + }, {
> + .fourcc = V4L2_PIX_FMT_RGB565,
> + .write_format = RKISP1_MI_CTRL_SP_WRITE_PLA,
> + .output_format = RKISP1_MI_CTRL_SP_OUTPUT_RGB565,
> + .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
> + },
> /* yuv420 */
> {
> .fourcc = V4L2_PIX_FMT_NV21,
> @@ -274,26 +302,6 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_sp_fmts[] = {
> .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV420,
> .mbus = MEDIA_BUS_FMT_YUYV8_1_5X8,
> },
> - /* yuv400 */
> - {
> - .fourcc = V4L2_PIX_FMT_GREY,
> - .uv_swap = 0,
> - .write_format = RKISP1_MI_CTRL_SP_WRITE_INT,
> - .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV400,
> - .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
> - },
> - /* rgb */
> - {
> - .fourcc = V4L2_PIX_FMT_XBGR32,
> - .write_format = RKISP1_MI_CTRL_SP_WRITE_PLA,
> - .output_format = RKISP1_MI_CTRL_SP_OUTPUT_RGB888,
> - .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
> - }, {
> - .fourcc = V4L2_PIX_FMT_RGB565,
> - .write_format = RKISP1_MI_CTRL_SP_WRITE_PLA,
> - .output_format = RKISP1_MI_CTRL_SP_OUTPUT_RGB565,
> - .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
> - },
> };
>
> static const struct rkisp1_capture_config rkisp1_capture_config_mp = {
> @@ -334,6 +342,30 @@ rkisp1_vdev_to_node(struct video_device *vdev)
> return container_of(vdev, struct rkisp1_vdev_node, vdev);
> }
>
> +int rkisp1_cap_enum_mbus_codes(struct rkisp1_capture *cap,
> + struct v4l2_subdev_mbus_code_enum *code)
> +{
> + const struct rkisp1_capture_fmt_cfg *fmts = cap->config->fmts;
> + /*
> + * initialize curr_mbus to non existing mbus code 0 to ensure it is
> + * different from fmts[0].mbus
> + */
> + u32 curr_mbus = 0;
> + int i, n = 0;
unsigned
Acked-by: Helen Koike <helen.koike@collabora.com>
Thanks
Helen
> +
> + for (i = 0; i < cap->config->fmt_size; i++) {
> + if (fmts[i].mbus == curr_mbus)
> + continue;
> +
> + curr_mbus = fmts[i].mbus;
> + if (n++ == code->index) {
> + code->code = curr_mbus;
> + return 0;
> + }
> + }
> + return -EINVAL;
> +}
> +
> /* ----------------------------------------------------------------------------
> * Stream operations for self-picture path (sp) and main-picture path (mp)
> */
> diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h
> index 992d8ec4c448..8cdfcaab268e 100644
> --- a/drivers/staging/media/rkisp1/rkisp1-common.h
> +++ b/drivers/staging/media/rkisp1/rkisp1-common.h
> @@ -410,6 +410,17 @@ static inline u32 rkisp1_read(struct rkisp1_device *rkisp1, unsigned int addr)
> return readl(rkisp1->base_addr + addr);
> }
>
> +/*
> + * rkisp1_cap_enum_mbus_codes - A helper function that return the i'th supported mbus code
> + * of the capture entity. This is used to enumerate the supported
> + * mbus codes on the source pad of the resizer.
> + *
> + * @cap: the capture entity
> + * @code: the mbus code, the function reads the code->index and fills the code->code
> + */
> +int rkisp1_cap_enum_mbus_codes(struct rkisp1_capture *cap,
> + struct v4l2_subdev_mbus_code_enum *code);
> +
> /*
> * rkisp1_sd_adjust_crop_rect - adjust a rectangle to fit into another rectangle.
> *
>
next prev parent reply other threads:[~2020-09-07 17:14 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-01 11:16 [PATCH v4 00/10] media: staging: rkisp1: add support to V4L2_CAP_IO_MC Dafna Hirschfeld
2020-09-01 11:16 ` [PATCH v4 01/10] media: staging: rkisp1: cap: change RGB24 format to XBGR32 Dafna Hirschfeld
2020-09-01 11:16 ` [PATCH v4 02/10] media: staging: rkisp1: cap: remove unsupported formats Dafna Hirschfeld
2020-09-26 13:17 ` Tomasz Figa
2020-09-27 9:33 ` Dafna Hirschfeld
2020-09-27 12:01 ` Tomasz Figa
2020-09-01 11:16 ` [PATCH v4 03/10] media: staging: rkisp1: cap: remove unsupported format YUV444 Dafna Hirschfeld
2020-09-07 14:19 ` Helen Koike
2020-09-01 11:16 ` [PATCH v4 04/10] media: staging: rkisp1: don't support bayer format on selfpath resizer Dafna Hirschfeld
2020-09-01 11:16 ` [PATCH v4 05/10] media: staging: rkisp1: add capability V4L2_CAP_IO_MC to capture devices Dafna Hirschfeld
2020-09-07 14:19 ` Helen Koike
2020-09-01 11:16 ` [PATCH v4 06/10] media: staging: rkisp1: add a helper function to enumerate supported mbus formats on capture Dafna Hirschfeld
2020-09-07 14:19 ` Helen Koike [this message]
2020-09-01 11:16 ` [PATCH v4 07/10] media: staging: rkisp1: rsz: enumerate the formats on the src pad according to the capture Dafna Hirschfeld
2020-09-07 14:19 ` Helen Koike
2020-09-01 11:16 ` [PATCH v4 08/10] media: staging: rkisp1: rsz: Add support to more YUV encoded mbus codes on src pad Dafna Hirschfeld
2020-09-07 14:19 ` Helen Koike
2020-09-01 11:16 ` [PATCH v4 09/10] media: staging: rkisp1: cap: simplify the link validation by compering the media bus code Dafna Hirschfeld
2020-09-07 14:19 ` Helen Koike
2020-09-01 11:16 ` [PATCH v4 10/10] media: staging: rkisp1: fix configuration for GREY pixelformat Dafna Hirschfeld
2020-09-07 14:19 ` Helen Koike
2020-09-26 13:38 ` [PATCH v4 00/10] media: staging: rkisp1: add support to V4L2_CAP_IO_MC Tomasz Figa
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=a275c902-4dda-a06b-fc11-1acb40115ca2@collabora.com \
--to=helen.koike@collabora.com \
--cc=dafna.hirschfeld@collabora.com \
--cc=dafna3@gmail.com \
--cc=ezequiel@collabora.com \
--cc=hverkuil@xs4all.nl \
--cc=kernel@collabora.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=tfiga@chromium.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).