linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-sunxi@lists.linux.dev
Cc: Yong Deng <yong.deng@magewell.com>,
	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>,
	Maxime Ripard <mripard@kernel.org>,
	Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: [PATCH v5 34/44] media: sun6i-csi: Introduce format match structure, list and helper
Date: Wed, 25 May 2022 21:06:07 +0200	[thread overview]
Message-ID: <20220525190617.696344-35-paul.kocialkowski@bootlin.com> (raw)
In-Reply-To: <20220525190617.696344-1-paul.kocialkowski@bootlin.com>

Introduce a list of mbus/pixel format combinations that need an exact
match between the two sides. This is the case when using raw input
configuration. The list will be used to replace the
sun6i_csi_is_format_supported combinatory helper.

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
 .../sunxi/sun6i-csi/sun6i_csi_capture.c       | 117 ++++++++++++++++++
 .../sunxi/sun6i-csi/sun6i_csi_capture.h       |   5 +
 2 files changed, 122 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 e8e71796afcb..aefb506c438d 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
@@ -227,6 +227,123 @@ struct sun6i_csi_capture_format *sun6i_csi_capture_format_find(u32 pixelformat)
 	return NULL;
 }
 
+/* RAW formats need an exact match between pixel and mbus formats. */
+static const
+struct sun6i_csi_capture_format_match sun6i_csi_capture_format_matches[] = {
+	/* YUV420 */
+	{
+		.pixelformat	= V4L2_PIX_FMT_YUYV,
+		.mbus_code	= MEDIA_BUS_FMT_YUYV8_2X8,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_YUYV,
+		.mbus_code	= MEDIA_BUS_FMT_YUYV8_1X16,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_YVYU,
+		.mbus_code	= MEDIA_BUS_FMT_YVYU8_2X8,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_YVYU,
+		.mbus_code	= MEDIA_BUS_FMT_YVYU8_1X16,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_UYVY,
+		.mbus_code	= MEDIA_BUS_FMT_UYVY8_2X8,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_UYVY,
+		.mbus_code	= MEDIA_BUS_FMT_UYVY8_1X16,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_VYUY,
+		.mbus_code	= MEDIA_BUS_FMT_VYUY8_2X8,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_VYUY,
+		.mbus_code	= MEDIA_BUS_FMT_VYUY8_1X16,
+	},
+	/* RGB */
+	{
+		.pixelformat	= V4L2_PIX_FMT_RGB565,
+		.mbus_code	= MEDIA_BUS_FMT_RGB565_2X8_LE,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_RGB565X,
+		.mbus_code	= MEDIA_BUS_FMT_RGB565_2X8_BE,
+	},
+	/* Bayer */
+	{
+		.pixelformat	= V4L2_PIX_FMT_SBGGR8,
+		.mbus_code	= MEDIA_BUS_FMT_SBGGR8_1X8,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_SGBRG8,
+		.mbus_code	= MEDIA_BUS_FMT_SGBRG8_1X8,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_SGRBG8,
+		.mbus_code	= MEDIA_BUS_FMT_SGRBG8_1X8,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_SRGGB8,
+		.mbus_code	= MEDIA_BUS_FMT_SRGGB8_1X8,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_SBGGR10,
+		.mbus_code	= MEDIA_BUS_FMT_SBGGR10_1X10,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_SGBRG10,
+		.mbus_code	= MEDIA_BUS_FMT_SGBRG10_1X10,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_SGRBG10,
+		.mbus_code	= MEDIA_BUS_FMT_SGRBG10_1X10,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_SRGGB10,
+		.mbus_code	= MEDIA_BUS_FMT_SRGGB10_1X10,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_SBGGR12,
+		.mbus_code	= MEDIA_BUS_FMT_SBGGR12_1X12,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_SGBRG12,
+		.mbus_code	= MEDIA_BUS_FMT_SGBRG12_1X12,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_SGRBG12,
+		.mbus_code	= MEDIA_BUS_FMT_SGRBG12_1X12,
+	},
+	{
+		.pixelformat	= V4L2_PIX_FMT_SRGGB12,
+		.mbus_code	= MEDIA_BUS_FMT_SRGGB12_1X12,
+	},
+	/* Compressed */
+	{
+		.pixelformat	= V4L2_PIX_FMT_JPEG,
+		.mbus_code	= MEDIA_BUS_FMT_JPEG_1X8,
+	},
+};
+
+static bool sun6i_csi_capture_format_match(u32 pixelformat, u32 mbus_code)
+{
+	unsigned int i;
+
+	for (i = 0; i < ARRAY_SIZE(sun6i_csi_capture_format_matches); i++) {
+		const struct sun6i_csi_capture_format_match *match =
+			&sun6i_csi_capture_format_matches[i];
+
+		if (match->pixelformat == pixelformat &&
+		    match->mbus_code == mbus_code)
+			return true;
+	}
+
+	return false;
+}
+
 /* Capture */
 
 static void sun6i_csi_capture_irq_enable(struct sun6i_csi_device *csi_dev)
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h
index 4b1ff19edc2f..2605b16f091c 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h
@@ -27,6 +27,11 @@ struct sun6i_csi_capture_format {
 	u32	hsize_len_factor;
 };
 
+struct sun6i_csi_capture_format_match {
+	u32	pixelformat;
+	u32	mbus_code;
+};
+
 #undef current
 struct sun6i_csi_capture_state {
 	struct list_head		queue;
-- 
2.36.1


  parent reply	other threads:[~2022-05-25 19:10 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-25 19:05 [PATCH v5 00/44] Allwinner A31/A83T MIPI CSI-2 and A31 ISP / CSI Rework Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 01/44] media: sun6i-csi: Define and use driver name and (reworked) description Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 02/44] media: sun6i-csi: Refactor main driver data structures Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 03/44] media: sun6i-csi: Tidy up platform code Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 04/44] media: sun6i-csi: Always set exclusive module clock rate Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 05/44] media: sun6i-csi: Define and use variant to get " Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 06/44] media: sun6i-csi: Use runtime pm for clocks and reset Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 07/44] media: sun6i-csi: Tidy up Kconfig Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 08/44] media: sun6i-csi: Tidy up v4l2 code Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 09/44] media: sun6i-csi: Tidy up video code Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 10/44] media: sun6i-csi: Pass and store csi device directly in " Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 11/44] media: sun6i-csi: Register the media device after creation Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 12/44] media: sun6i-csi: Remove controls handler from the driver Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 13/44] media: sun6i-csi: Add media ops with link notify callback Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 14/44] media: sun6i-csi: Introduce and use video helper functions Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 15/44] media: sun6i-csi: Move csi buffer definition to main header file Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 16/44] media: media-entity: Add helper to get a single enabled link Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 17/44] media: sun6i-csi: Add bridge v4l2 subdev with port management Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 18/44] media: sun6i-csi: Rename sun6i_video to sun6i_csi_capture Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 19/44] media: sun6i-csi: Add capture state using vsync for page flip Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 20/44] media: sun6i-csi: Rework register definitions, invert misleading fields Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 21/44] media: sun6i-csi: Add dimensions and format helpers to capture Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 22/44] media: sun6i-csi: Implement address configuration without indirection Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 23/44] media: sun6i-csi: Split stream sequences and irq code in capture Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 24/44] media: sun6i-csi: Move power management to runtime pm " Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 25/44] media: sun6i-csi: Move register configuration to capture Paul Kocialkowski
2022-05-25 19:05 ` [PATCH v5 26/44] media: sun6i-csi: Rework capture format management with helper Paul Kocialkowski
2022-05-25 19:06 ` [PATCH v5 27/44] media: sun6i-csi: Remove custom format helper and rework configure Paul Kocialkowski
2022-05-25 19:06 ` [PATCH v5 28/44] media: sun6i-csi: Add bridge dimensions and format helpers Paul Kocialkowski
2022-05-25 19:06 ` [PATCH v5 29/44] media: sun6i-csi: Get mbus code from bridge instead of storing it Paul Kocialkowski
2022-05-25 19:06 ` [PATCH v5 30/44] media: sun6i-csi: Tidy capture configure code Paul Kocialkowski
2022-05-25 19:06 ` [PATCH v5 31/44] media: sun6i-csi: Introduce bridge format structure, list and helper Paul Kocialkowski
2022-05-25 19:06 ` [PATCH v5 32/44] media: sun6i-csi: Introduce capture " Paul Kocialkowski
2022-05-25 19:06 ` [PATCH v5 33/44] media: sun6i-csi: Configure registers from format tables Paul Kocialkowski
2022-05-25 19:06 ` Paul Kocialkowski [this message]
2022-05-25 19:06 ` [PATCH v5 35/44] media: sun6i-csi: Implement capture link validation with logic Paul Kocialkowski
2022-05-25 19:06 ` [PATCH v5 36/44] media: sun6i-csi: Get bridge subdev directly in capture stream ops Paul Kocialkowski
2022-05-25 19:06 ` [PATCH v5 37/44] media: sun6i-csi: Move hardware control to the bridge Paul Kocialkowski
2022-05-25 19:06 ` [PATCH v5 38/44] media: sun6i-csi: Rename the capture video device to sun6i-csi-capture Paul Kocialkowski
2022-05-25 19:06 ` [PATCH v5 39/44] media: sun6i-csi: Cleanup headers and includes, update copyright lines Paul Kocialkowski
2022-05-25 19:06 ` [PATCH v5 40/44] media: sun6i-csi: Add support for MIPI CSI-2 to the bridge code Paul Kocialkowski
2022-05-25 19:06 ` [PATCH v5 41/44] media: sun6i-csi: Only configure capture when streaming Paul Kocialkowski
2022-05-25 19:06 ` [PATCH v5 42/44] media: sun6i-csi: Add extra checks to the interrupt routine Paul Kocialkowski
2022-05-25 19:06 ` [PATCH v5 43/44] media: sun6i-csi: Request a shared interrupt Paul Kocialkowski
2022-05-25 19:06 ` [PATCH v5 44/44] MAINTAINERS: Add myself as sun6i-csi maintainer and rename/move entry Paul Kocialkowski

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=20220525190617.696344-35-paul.kocialkowski@bootlin.com \
    --to=paul.kocialkowski@bootlin.com \
    --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-sunxi@lists.linux.dev \
    --cc=mchehab@kernel.org \
    --cc=mripard@kernel.org \
    --cc=samuel@sholland.org \
    --cc=thomas.petazzoni@bootlin.com \
    --cc=wens@csie.org \
    --cc=yong.deng@magewell.com \
    /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).