From: Jai Luthra <j-luthra@ti.com>
To: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Vaishnav Achath <vaishnav.a@ti.com>,
Maxime Ripard <mripard@kernel.org>, Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>
Cc: <linux-media@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<devicetree@vger.kernel.org>,
Vignesh Raghavendra <vigneshr@ti.com>,
Aradhya Bhatia <a-bhatia1@ti.com>,
Devarsh Thakkar <devarsht@ti.com>,
Changhuang Liang <changhuang.liang@starfivetech.com>,
Jack Zhu <jack.zhu@starfivetech.com>,
Julien Massot <julien.massot@collabora.com>,
Jayshri Pawar <jpawar@cadence.com>, Jai Luthra <j-luthra@ti.com>
Subject: [PATCH RFC 16/21] SQUASH: media: cadence: csi2rx: Filter using MIPI virtual channels
Date: Thu, 22 Feb 2024 17:01:32 +0530 [thread overview]
Message-ID: <20240222-multistream-v1-16-1837ed916eeb@ti.com> (raw)
In-Reply-To: <20240222-multistream-v1-0-1837ed916eeb@ti.com>
With stream routing now supported by the driver, we can check if the
CSI-TX source provides extra bus information through frame descriptor
entries, and use it to filter for particular VCs on the source pads.
Signed-off-by: Jai Luthra <j-luthra@ti.com>
---
drivers/media/platform/cadence/cdns-csi2rx.c | 59 +++++++++++++++++++++++++---
1 file changed, 53 insertions(+), 6 deletions(-)
diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c
index f08d3b845dc9..f96638b9f252 100644
--- a/drivers/media/platform/cadence/cdns-csi2rx.c
+++ b/drivers/media/platform/cadence/cdns-csi2rx.c
@@ -90,6 +90,7 @@ struct csi2rx_priv {
struct reset_control *pixel_rst[CSI2RX_STREAMS_MAX];
struct phy *dphy;
+ u32 vc_select[CSI2RX_STREAMS_MAX];
u8 lanes[CSI2RX_LANES_MAX];
u8 num_lanes;
u8 max_lanes;
@@ -312,11 +313,7 @@ static int csi2rx_start(struct csi2rx_priv *csi2rx)
writel(CSI2RX_STREAM_CFG_FIFO_MODE_LARGE_BUF,
csi2rx->base + CSI2RX_STREAM_CFG_REG(i));
- /*
- * Enable one virtual channel. When multiple virtual channels
- * are supported this will have to be changed.
- */
- writel(CSI2RX_STREAM_DATA_CFG_VC_SELECT(0),
+ writel(csi2rx->vc_select[i],
csi2rx->base + CSI2RX_STREAM_DATA_CFG_REG(i));
writel(CSI2RX_STREAM_CTRL_START,
@@ -387,6 +384,48 @@ static void csi2rx_stop(struct csi2rx_priv *csi2rx)
}
}
+static void csi2rx_update_vc_select(struct csi2rx_priv *csi2rx,
+ struct v4l2_subdev_state *state)
+{
+ struct v4l2_mbus_frame_desc fd = {0};
+ struct v4l2_subdev_route *route;
+ unsigned int i;
+ int ret;
+
+ for (i = 0; i < CSI2RX_STREAMS_MAX; i++)
+ csi2rx->vc_select[i] = 0;
+
+ ret = csi2rx_get_frame_desc_from_source(csi2rx, &fd);
+ if (ret || fd.type != V4L2_MBUS_FRAME_DESC_TYPE_CSI2) {
+ dev_dbg(csi2rx->dev,
+ "Failed to get source frame desc, allowing only VC=0\n");
+ goto err_no_fd;
+ }
+
+ /* If source provides per-stream VC info, use it to filter by VC */
+ for_each_active_route(&state->routing, route) {
+ int cdns_stream = route->source_pad - CSI2RX_PAD_SOURCE_STREAM0;
+ u8 used_vc;
+
+ for (i = 0; i < fd.num_entries; i++) {
+ if (fd.entry[i].stream == route->sink_stream) {
+ used_vc = fd.entry[i].bus.csi2.vc;
+ break;
+ }
+ }
+ csi2rx->vc_select[cdns_stream] |=
+ CSI2RX_STREAM_DATA_CFG_VC_SELECT(used_vc);
+ }
+
+err_no_fd:
+ for (i = 0; i < CSI2RX_STREAMS_MAX; i++) {
+ if (!csi2rx->vc_select[i]) {
+ csi2rx->vc_select[i] =
+ CSI2RX_STREAM_DATA_CFG_VC_SELECT(0);
+ }
+ }
+}
+
static int csi2rx_enable_streams(struct v4l2_subdev *subdev,
struct v4l2_subdev_state *state, u32 pad,
u64 streams_mask)
@@ -558,11 +597,19 @@ static int csi2rx_set_routing(struct v4l2_subdev *subdev,
struct v4l2_subdev_krouting *routing)
{
struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev);
+ int ret;
if (which == V4L2_SUBDEV_FORMAT_ACTIVE && csi2rx->count)
return -EBUSY;
- return _csi2rx_set_routing(subdev, state, routing);
+ ret = _csi2rx_set_routing(subdev, state, routing);
+
+ if (ret)
+ return ret;
+
+ csi2rx_update_vc_select(csi2rx, state);
+
+ return 0;
}
static int csi2rx_set_fmt(struct v4l2_subdev *subdev,
--
2.43.0
next prev parent reply other threads:[~2024-02-22 11:33 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 11:31 [PATCH RFC 00/21] media: cadence,ti: CSI2RX Multistream Support Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 01/21] media: ti: j721e-csi2rx: Fix races while restarting DMA Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 02/21] media: cadence: csi2rx: configure DPHY before starting source stream Jai Luthra
2024-02-22 14:29 ` Julien Massot
2024-02-23 7:23 ` Jai Luthra
2024-02-23 2:46 ` 回复: " Changhuang Liang
2024-02-22 11:31 ` [PATCH RFC 03/21] media: cadence: csi2rx: Support runtime PM Jai Luthra
2024-03-22 9:26 ` 回复: " Changhuang Liang
2024-03-22 11:13 ` Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 04/21] dt-bindings: media: ti,j721e-csi2rx-shim: Support 32 dma chans Jai Luthra
2024-02-22 12:25 ` Rob Herring
2024-02-23 7:44 ` Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 05/21] media: ti: j721e-csi2rx: separate out device and context Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 06/21] media: ti: j721e-csi2rx: prepare SHIM code for multiple contexts Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 07/21] media: ti: j721e-csi2rx: allocate DMA channel based on context index Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 08/21] media: ti: j721e-csi2rx: add a subdev for the core device Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 09/21] SQUASH: media: ti: j721e-csi2rx: Fix link validation for multi-stream Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 10/21] media: ti: j721e-csi2rx: get number of contexts from device tree Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 11/21] media: cadence: csi2rx: add get_frame_desc wrapper Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 12/21] media: ti: j721e-csi2rx: add support for processing virtual channels Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 13/21] media: cadence: csi2rx: Use new enable stream APIs Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 14/21] media: cadence: csi2rx: Enable stream-wise routing Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 15/21] SQUASH: media: cadence: csi2rx: Enable per-stream controls Jai Luthra
2024-02-22 11:31 ` Jai Luthra [this message]
2024-02-22 11:31 ` [PATCH RFC 17/21] SQUASH: media: cadence: csi2rx: Filter streams in get_frame_desc Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 18/21] media: ti: j721e-csi2rx: add multistream support Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 19/21] SQUASH: media: ti: j721e-csi2rx: Enable per-stream controls Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 20/21] SQUASH: media: ti: j721e-csi2rx: Assert pixel reset before stopping last stream Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 21/21] media: ti: j721e-csi2rx: Submit all available buffers Jai Luthra
2024-02-23 2:53 ` 回复: [PATCH RFC 00/21] media: cadence,ti: CSI2RX Multistream Support Changhuang Liang
2024-02-23 7:49 ` Jai Luthra
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=20240222-multistream-v1-16-1837ed916eeb@ti.com \
--to=j-luthra@ti.com \
--cc=a-bhatia1@ti.com \
--cc=changhuang.liang@starfivetech.com \
--cc=conor+dt@kernel.org \
--cc=devarsht@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jack.zhu@starfivetech.com \
--cc=jpawar@cadence.com \
--cc=julien.massot@collabora.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=robh@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=tomi.valkeinen@ideasonboard.com \
--cc=vaishnav.a@ti.com \
--cc=vigneshr@ti.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
all inboxes | Powered by JetHome®