From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com,
Wentong Wu <wentong.wu@intel.com>
Subject: [PATCH v4 2/4] media: v4l: Support obtaining link frequency via get_mbus_config
Date: Mon, 29 Apr 2024 22:08:50 +0300 [thread overview]
Message-ID: <20240429190852.1008003-3-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20240429190852.1008003-1-sakari.ailus@linux.intel.com>
Add link_freq field to struct v4l2_mbus_config in order to pass the link
frequency to the reciving sub-device.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/v4l2-core/v4l2-common.c | 13 +++++++++----
include/media/v4l2-mediabus.h | 2 ++
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c
index 7f69b5a025fa..09b26ce612e9 100644
--- a/drivers/media/v4l2-core/v4l2-common.c
+++ b/drivers/media/v4l2-core/v4l2-common.c
@@ -503,15 +503,20 @@ s64 __v4l2_get_link_freq_ctrl(struct v4l2_ctrl_handler *handler,
EXPORT_SYMBOL_GPL(__v4l2_get_link_freq_ctrl);
s64 __v4l2_get_link_freq_pad(struct media_pad *pad, unsigned int mul,
- unsigned int div)
+ unsigned int div)
{
+ struct v4l2_mbus_config mbus_config = {};
struct v4l2_subdev *sd;
+ int ret;
sd = media_entity_to_v4l2_subdev(pad->entity);
- if (!sd)
- return -ENODEV;
+ ret = v4l2_subdev_call(sd, pad, get_mbus_config, pad->index,
+ &mbus_config);
+ if (ret < 0 && ret != -ENOIOCTLCMD)
+ return ret;
- return __v4l2_get_link_freq_ctrl(sd->ctrl_handler, mul, div);
+ return mbus_config.link_freq ?:
+ __v4l2_get_link_freq_ctrl(sd->ctrl_handler, mul, div);
}
EXPORT_SYMBOL_GPL(__v4l2_get_link_freq_pad);
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
index 5bce6e423e94..2f39b52bb4d4 100644
--- a/include/media/v4l2-mediabus.h
+++ b/include/media/v4l2-mediabus.h
@@ -159,6 +159,7 @@ enum v4l2_mbus_type {
* @bus.mipi_csi2: embedded &struct v4l2_mbus_config_mipi_csi2.
* Used if the bus is MIPI Alliance's Camera Serial
* Interface version 2 (MIPI CSI2).
+ * @link_freq: The link frequency. See also V4L2_CID_LINK_FREQ control.
*/
struct v4l2_mbus_config {
enum v4l2_mbus_type type;
@@ -167,6 +168,7 @@ struct v4l2_mbus_config {
struct v4l2_mbus_config_mipi_csi1 mipi_csi1;
struct v4l2_mbus_config_mipi_csi2 mipi_csi2;
} bus;
+ u64 link_freq;
};
/**
--
2.39.2
next prev parent reply other threads:[~2024-04-29 19:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-29 19:08 [PATCH v4 0/4] Use V4L2 mbus config for conveying MEI CSI link frequency Sakari Ailus
2024-04-29 19:08 ` [PATCH v4 1/4] media: v4l: Support passing sub-device argument to v4l2_get_link_freq() Sakari Ailus
2024-04-30 7:01 ` Jacopo Mondi
2024-04-30 7:27 ` Sakari Ailus
2024-04-29 19:08 ` Sakari Ailus [this message]
2024-04-30 7:19 ` [PATCH v4 2/4] media: v4l: Support obtaining link frequency via get_mbus_config Jacopo Mondi
2024-04-30 7:29 ` Sakari Ailus
2024-04-29 19:08 ` [PATCH v4 3/4] media: Documentation: Update link frequency driver documentation Sakari Ailus
2024-04-30 7:23 ` Jacopo Mondi
2024-04-30 7:31 ` Sakari Ailus
2024-04-29 19:08 ` [PATCH v4 4/4] media: ivsc: csi: Obtain link frequency from the media pad Sakari Ailus
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=20240429190852.1008003-3-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=hverkuil@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=wentong.wu@intel.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