From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
To: "Laurent Pinchart" <laurent.pinchart@ideasonboard.com>,
"Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>,
"Sakari Ailus" <sakari.ailus@linux.intel.com>,
"Kieran Bingham" <kieran.bingham+renesas@ideasonboard.com>,
"Tomi Valkeinen" <tomi.valkeinen@ideasonboard.com>
Cc: Jacopo Mondi <jacopo.mondi@ideasonboard.com>,
linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org
Subject: [PATCH v3 06/11] media: adv748x-csi2: Validate the image format
Date: Thu, 9 May 2024 18:13:56 +0200 [thread overview]
Message-ID: <20240509161403.111789-7-jacopo.mondi@ideasonboard.com> (raw)
In-Reply-To: <20240509161403.111789-1-jacopo.mondi@ideasonboard.com>
The adv748x-csi2 driver configures the CSI-2 transmitter to
automatically infer the image stream format from the connected
frontend (HDMI or AFE).
Setting a new format on the subdevice hence does not actually control
the CSI-2 output format, but it's only there for the purpose of
pipeline validation.
However, there is currently no validation that the supplied media bus
code is valid and supported by the device.
With the introduction of enum_mbus_codes a list of supported format is
now available, use it to validate that the supplied format is correct
and use the default UYVY8 one if that's not the case.
Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/media/i2c/adv748x/adv748x-csi2.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/drivers/media/i2c/adv748x/adv748x-csi2.c b/drivers/media/i2c/adv748x/adv748x-csi2.c
index 29b18b6c8b0e..0cdb397d9e0a 100644
--- a/drivers/media/i2c/adv748x/adv748x-csi2.c
+++ b/drivers/media/i2c/adv748x/adv748x-csi2.c
@@ -218,6 +218,22 @@ static int adv748x_csi2_get_format(struct v4l2_subdev *sd,
return 0;
}
+static bool adv748x_csi2_is_fmt_supported(struct adv748x_csi2 *tx, u32 code)
+{
+ const unsigned int *codes = is_txa(tx) ?
+ adv748x_csi2_txa_fmts :
+ adv748x_csi2_txb_fmts;
+ size_t num_fmts = is_txa(tx) ? ARRAY_SIZE(adv748x_csi2_txa_fmts)
+ : ARRAY_SIZE(adv748x_csi2_txb_fmts);
+
+ for (unsigned int i = 0; i < num_fmts; i++) {
+ if (codes[i] == code)
+ return true;
+ }
+
+ return false;
+}
+
static int adv748x_csi2_set_format(struct v4l2_subdev *sd,
struct v4l2_subdev_state *sd_state,
struct v4l2_subdev_format *sdformat)
@@ -227,6 +243,13 @@ static int adv748x_csi2_set_format(struct v4l2_subdev *sd,
struct v4l2_mbus_framefmt *mbusformat;
int ret = 0;
+ /*
+ * Make sure the format is supported, if not default it to
+ * UYVY8 as it's supported by both TXes.
+ */
+ if (!adv748x_csi2_is_fmt_supported(tx, sdformat->format.code))
+ sdformat->format.code = MEDIA_BUS_FMT_UYVY8_1X16;
+
mbusformat = adv748x_csi2_get_pad_format(sd, sd_state, sdformat->pad,
sdformat->which);
if (!mbusformat)
--
2.44.0
next prev parent reply other threads:[~2024-05-09 16:14 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-09 16:13 [PATCH v3 00/11] media: renesas: rcar-csi2: Use the subdev active state Jacopo Mondi
2024-05-09 16:13 ` [PATCH v3 01/11] media: rcar-vin: Fix YUYV8_1X16 handling for CSI-2 Jacopo Mondi
2024-05-09 22:34 ` Niklas Söderlund
2024-05-09 16:13 ` [PATCH v3 02/11] media: rcar-csi2: Disable runtime_pm in probe error Jacopo Mondi
2024-05-09 22:35 ` Niklas Söderlund
2024-05-09 16:13 ` [PATCH v3 03/11] media: rcar-csi2: Cleanup subdevice in remove() Jacopo Mondi
2024-05-09 22:35 ` Niklas Söderlund
2024-05-09 16:13 ` [PATCH v3 04/11] media: rcar-csi2: Use the subdev active state Jacopo Mondi
2024-05-09 22:40 ` Niklas Söderlund
2024-05-09 16:13 ` [PATCH v3 05/11] media: adv748x-csi2: Implement enum_mbus_codes Jacopo Mondi
2024-05-09 20:44 ` Laurent Pinchart
2024-05-09 22:43 ` Niklas Söderlund
2024-05-09 16:13 ` Jacopo Mondi [this message]
2024-05-09 22:42 ` [PATCH v3 06/11] media: adv748x-csi2: Validate the image format Niklas Söderlund
2024-05-09 16:13 ` [PATCH v3 07/11] media: adv748x-csi2: Use the subdev active state Jacopo Mondi
2024-05-09 22:45 ` Niklas Söderlund
2024-05-09 16:13 ` [PATCH v3 08/11] media: adv748x-afe: Use 1X16 media bus code Jacopo Mondi
2024-05-09 21:45 ` Niklas Söderlund
2024-05-09 16:13 ` [PATCH v3 09/11] media: max9286: Fix enum_mbus_code Jacopo Mondi
2024-05-09 16:14 ` [PATCH v3 10/11] media: max9286: Use the subdev active state Jacopo Mondi
2024-05-09 20:46 ` Laurent Pinchart
2024-05-09 16:14 ` [PATCH v3 11/11] media: max9286: Use frame interval from subdev state Jacopo Mondi
2024-05-09 20:51 ` [PATCH v3 00/11] media: renesas: rcar-csi2: Use the subdev active state Laurent Pinchart
2024-05-09 22:48 ` Niklas Söderlund
2024-05-09 23:06 ` Laurent Pinchart
2024-05-10 8:36 ` Niklas Söderlund
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=20240509161403.111789-7-jacopo.mondi@ideasonboard.com \
--to=jacopo.mondi@ideasonboard.com \
--cc=kieran.bingham+renesas@ideasonboard.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=niklas.soderlund+renesas@ragnatech.se \
--cc=sakari.ailus@linux.intel.com \
--cc=tomi.valkeinen@ideasonboard.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 read-only IMAP folder(s) and NNTP newsgroup(s).