From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
To: Rishikesh Donadkar <r-donadkar@ti.com>
Cc: y-abhilashchandra@ti.com, devarsht@ti.com, s-jain1@ti.com,
vigneshr@ti.com, mchehab@kernel.org, robh@kernel.org,
krzk+dt@kernel.org, p.zabel@pengutronix.de, conor+dt@kernel.org,
sakari.ailus@linux.intel.com, hverkuil-cisco@xs4all.nl,
jai.luthra@ideasonboard.com, changhuang.liang@starfivetech.com,
jack.zhu@starfivetech.com, sjoerd@collabora.com,
dan.carpenter@linaro.org, hverkuil+cisco@kernel.org,
linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
devicetree@vger.kernel.org, jai.luthra@linux.dev,
laurent.pinchart@ideasonboard.com, mripard@kernel.org
Subject: Re: [PATCH v9 12/19] media: cadence: csi2rx: add multistream support
Date: Thu, 15 Jan 2026 14:01:49 +0200 [thread overview]
Message-ID: <1029b7b3-44cf-4ed5-b90a-a476d39da5a8@ideasonboard.com> (raw)
In-Reply-To: <20251230083220.2405247-13-r-donadkar@ti.com>
Hi,
On 30/12/2025 10:32, Rishikesh Donadkar wrote:
> From: Jai Luthra <j-luthra@ti.com>
>
> Cadence CSI-2 bridge IP supports capturing multiple virtual "streams"
> of data over the same physical interface using MIPI Virtual Channels.
>
> While the hardware IP supports usecases where streams coming in the sink
> pad can be broadcasted to multiple source pads, the driver will need
> significant re-architecture to make that possible. The two users of this
> IP in mainline linux are TI Shim and StarFive JH7110 CAMSS, and both
> have only integrated the first source pad i.e stream0 of this IP. So for
> now keep it simple and only allow 1-to-1 mapping of streams from sink to
> source, without any broadcasting.
>
> Signed-off-by: Jai Luthra <j-luthra@ti.com>
> Reviewed-by: Changhuang Liang <changhuang.liang@starfivetech.com>
> Reviewed-by: Yemike Abhilash Chandra <y-abhilashchandra@ti.com>
> Co-developed-by: Rishikesh Donadkar <r-donadkar@ti.com>
> Signed-off-by: Rishikesh Donadkar <r-donadkar@ti.com>
> ---
> drivers/media/platform/cadence/cdns-csi2rx.c | 248 +++++++++++++++----
> 1 file changed, 201 insertions(+), 47 deletions(-)
>
> diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c
> index 65c6acb02f85b..5c16a2e509136 100644
> --- a/drivers/media/platform/cadence/cdns-csi2rx.c
> +++ b/drivers/media/platform/cadence/cdns-csi2rx.c
> @@ -135,6 +135,7 @@ struct csi2rx_priv {
> struct phy *dphy;
>
> u8 num_pixels[CSI2RX_STREAMS_MAX];
> + u32 vc_select[CSI2RX_STREAMS_MAX];
> u8 lanes[CSI2RX_LANES_MAX];
> u8 num_lanes;
> u8 max_lanes;
> @@ -273,30 +274,43 @@ static void csi2rx_reset(struct csi2rx_priv *csi2rx)
>
> static int csi2rx_configure_ext_dphy(struct csi2rx_priv *csi2rx)
> {
> - struct media_pad *src_pad =
> - &csi2rx->source_subdev->entity.pads[csi2rx->source_pad];
> union phy_configure_opts opts = { };
> struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy;
> - struct v4l2_subdev_state *state;
> struct v4l2_mbus_framefmt *framefmt;
> + struct v4l2_subdev_state *state;
> const struct csi2rx_fmt *fmt;
> + int source_pad = csi2rx->source_pad;
> + struct media_pad *pad = &csi2rx->source_subdev->entity.pads[source_pad];
> s64 link_freq;
> int ret;
> + u32 bpp;
>
> state = v4l2_subdev_get_locked_active_state(&csi2rx->subdev);
>
> - framefmt = v4l2_subdev_state_get_format(state, CSI2RX_PAD_SINK, 0);
> - if (!framefmt) {
> - dev_err(csi2rx->dev, "Did not find active sink format\n");
> - return -EINVAL;
> - }
> + /*
> + * For multi-stream transmitters there is no single pixel rate.
> + *
> + * In multistream usecase pass bpp as 0 so that v4l2_get_link_freq()
> + * returns an error if it falls back to V4L2_CID_PIXEL_RATE.
> + */
> + if (state->routing.num_routes > 1) {
> + bpp = 0;
> + } else {
> + framefmt = v4l2_subdev_state_get_format(state, CSI2RX_PAD_SINK, 0);
> + if (!framefmt) {
> + dev_err(csi2rx->dev, "Did not find active sink format\n");
> + return -EINVAL;
> + }
>
> - fmt = csi2rx_get_fmt_by_code(framefmt->code);
> + fmt = csi2rx_get_fmt_by_code(framefmt->code);
> + bpp = fmt->bpp;
> + }
>
> - link_freq = v4l2_get_link_freq(src_pad,
> - fmt->bpp, 2 * csi2rx->num_lanes);
> - if (link_freq < 0)
> + link_freq = v4l2_get_link_freq(pad, bpp, 2 * csi2rx->num_lanes);
> + if (link_freq < 0) {
> + dev_err(csi2rx->dev, "Unable to calculate link frequency\n");
> return link_freq;
> + }
>
> ret = phy_mipi_dphy_get_default_config_for_hsclk(link_freq,
> csi2rx->num_lanes, cfg);
> @@ -394,11 +408,7 @@ static int csi2rx_start(struct csi2rx_priv *csi2rx)
> csi2rx->num_pixels[i]),
> 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,
> @@ -486,18 +496,59 @@ static int csi2rx_log_status(struct v4l2_subdev *sd)
> return 0;
> }
>
> +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;
> +
> + /* Capture VC=0 by default */
> + for (i = 0; i < CSI2RX_STREAMS_MAX; i++)
> + csi2rx->vc_select[i] = CSI2RX_STREAM_DATA_CFG_VC_SELECT(0);
This should be inside the if-block below, as in the other code path you
just memset the whole vc_select.
With that fixed:
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tomi
next prev parent reply other threads:[~2026-01-15 12:01 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-30 8:32 [PATCH v9 00/19] media: cadence,ti: CSI2RX Multistream Support Rishikesh Donadkar
2025-12-30 8:32 ` [PATCH v9 01/19] media: ti: j721e-csi2rx: Remove word size alignment on frame width Rishikesh Donadkar
2025-12-30 8:32 ` [PATCH v9 02/19] dt-bindings: media: ti,j721e-csi2rx-shim: Support 32 dma chans Rishikesh Donadkar
2025-12-30 8:32 ` [PATCH v9 03/19] media: ti: j721e-csi2rx: separate out device and context Rishikesh Donadkar
2025-12-30 8:32 ` [PATCH v9 04/19] media: ti: j721e-csi2rx: prepare SHIM code for multiple contexts Rishikesh Donadkar
2025-12-30 8:32 ` [PATCH v9 05/19] media: ti: j721e-csi2rx: allocate DMA channel based on context index Rishikesh Donadkar
2025-12-30 8:32 ` [PATCH v9 06/19] media: ti: j721e-csi2rx: add a subdev for the core device Rishikesh Donadkar
2026-01-14 15:21 ` Tomi Valkeinen
2026-01-15 6:36 ` Jai Luthra
2026-01-15 12:56 ` Tomi Valkeinen
2026-01-20 23:25 ` Laurent Pinchart
2026-01-21 7:38 ` Tomi Valkeinen
2026-01-21 10:52 ` Laurent Pinchart
2026-01-22 6:53 ` Jai Luthra
2026-01-22 9:53 ` Laurent Pinchart
2026-02-28 17:49 ` Jai Luthra
2026-01-21 9:10 ` Rishikesh Donadkar
2025-12-30 8:32 ` [PATCH v9 07/19] media: cadence: csi2rx: Move to .enable/disable_streams API Rishikesh Donadkar
2026-01-14 15:25 ` Tomi Valkeinen
2025-12-30 8:32 ` [PATCH v9 08/19] media: staging: starfive: Move to enabel-disable streams in starfive drivers Rishikesh Donadkar
2026-01-14 12:51 ` Jai Luthra
2026-01-14 13:05 ` Laurent Pinchart
2025-12-30 8:32 ` [PATCH v9 09/19] media: ti: j721e-csi2rx: get number of contexts from device tree Rishikesh Donadkar
2025-12-30 8:32 ` [PATCH v9 10/19] media: cadence: csi2rx: add get_frame_desc wrapper Rishikesh Donadkar
2025-12-30 8:32 ` [PATCH v9 11/19] media: ti: j721e-csi2rx: add support for processing virtual channels Rishikesh Donadkar
2026-01-14 15:31 ` Tomi Valkeinen
2026-01-16 10:28 ` Rishikesh Donadkar
2025-12-30 8:32 ` [PATCH v9 12/19] media: cadence: csi2rx: add multistream support Rishikesh Donadkar
2026-01-15 12:01 ` Tomi Valkeinen [this message]
2026-01-16 11:04 ` Rishikesh Donadkar
2025-12-30 8:32 ` [PATCH v9 13/19] media: ti: j721e-csi2rx: " Rishikesh Donadkar
2026-01-15 12:27 ` Tomi Valkeinen
2026-01-20 8:48 ` Rishikesh Donadkar
2026-01-15 12:28 ` Tomi Valkeinen
2026-01-20 8:52 ` Rishikesh Donadkar
2025-12-30 8:32 ` [PATCH v9 14/19] media: ti: j721e-csi2rx: Submit all available buffers Rishikesh Donadkar
2025-12-30 8:32 ` [PATCH v9 15/19] media: ti: j721e-csi2rx: Change the drain architecture for multistream Rishikesh Donadkar
2026-01-15 12:37 ` Tomi Valkeinen
2026-01-15 16:02 ` Jai Luthra
2026-01-16 10:11 ` Vignesh Raghavendra
2026-01-19 5:08 ` Rishikesh Donadkar
2026-01-19 5:04 ` Rishikesh Donadkar
2025-12-30 8:32 ` [PATCH v9 16/19] media: ti: j721e-csi2rx: Return the partial frame as error Rishikesh Donadkar
2026-01-06 11:15 ` Jai Luthra
2026-01-08 5:37 ` Rishikesh Donadkar
2026-01-15 12:39 ` Tomi Valkeinen
2025-12-30 8:32 ` [PATCH v9 17/19] media: cadence: csi2rx: Support runtime PM Rishikesh Donadkar
2026-01-14 17:04 ` Tomi Valkeinen
2025-12-30 8:32 ` [PATCH v9 18/19] media: ti: j721e-csi2rx: Support runtime suspend Rishikesh Donadkar
2026-01-15 12:46 ` Tomi Valkeinen
2026-01-19 6:04 ` Jai Luthra
2025-12-30 8:32 ` [PATCH v9 19/19] media: ti: j721e-csi2rx: Support system suspend using pm_notifier Rishikesh Donadkar
2026-01-15 12:50 ` Tomi Valkeinen
2026-01-19 5:25 ` Rishikesh Donadkar
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=1029b7b3-44cf-4ed5-b90a-a476d39da5a8@ideasonboard.com \
--to=tomi.valkeinen@ideasonboard.com \
--cc=changhuang.liang@starfivetech.com \
--cc=conor+dt@kernel.org \
--cc=dan.carpenter@linaro.org \
--cc=devarsht@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil+cisco@kernel.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jack.zhu@starfivetech.com \
--cc=jai.luthra@ideasonboard.com \
--cc=jai.luthra@linux.dev \
--cc=krzk+dt@kernel.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=r-donadkar@ti.com \
--cc=robh@kernel.org \
--cc=s-jain1@ti.com \
--cc=sakari.ailus@linux.intel.com \
--cc=sjoerd@collabora.com \
--cc=vigneshr@ti.com \
--cc=y-abhilashchandra@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®