* [PATCH v5 01/10] media: rcar-vin: Link VINs on Gen3 to a single channel on each CSI-2
2026-03-11 13:53 [PATCH v5 00/10] media: rcar: Streams support Tomi Valkeinen
@ 2026-03-11 13:53 ` Tomi Valkeinen
2026-04-04 12:09 ` Niklas Söderlund
2026-03-11 13:53 ` [PATCH v5 02/10] media: rcar-isp: Move {enable|disable}_streams() calls Tomi Valkeinen
` (10 subsequent siblings)
11 siblings, 1 reply; 21+ messages in thread
From: Tomi Valkeinen @ 2026-03-11 13:53 UTC (permalink / raw)
To: Niklas Söderlund, Mauro Carvalho Chehab, Sakari Ailus
Cc: linux-media, linux-renesas-soc, linux-kernel,
Niklas Söderlund, Mauro Carvalho Chehab, Laurent Pinchart,
Jacopo Mondi, Tomi Valkeinen
The stream routing will be fully configurable when we add full streams
support to the rcar pipeline. Thus there is no need for the user to be
able to link VINs to different CSI-2 channels. In fact, allowing e.g.
VIN0 to be connected to CSI-2 channel 3 would be wrong, as the hardware
doesn't allow that.
Change rvin_csi2_create_link() so that it creates media links only
between matching VINs and CSI-2 channels (VIN0 - channel 0, VIN1 -
channel 1, etc.).
Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
---
.../media/platform/renesas/rcar-vin/rcar-core.c | 27 ++++++++++++----------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-core.c b/drivers/media/platform/renesas/rcar-vin/rcar-core.c
index c8d564aa1eba..2fcea715101c 100644
--- a/drivers/media/platform/renesas/rcar-vin/rcar-core.c
+++ b/drivers/media/platform/renesas/rcar-vin/rcar-core.c
@@ -673,23 +673,26 @@ static int rvin_csi2_create_link(struct rvin_group *group, unsigned int id,
struct media_entity *source = &group->remotes[route->csi].subdev->entity;
struct media_entity *sink = &group->vin[id]->vdev.entity;
struct media_pad *sink_pad = &sink->pads[0];
+ struct media_pad *source_pad;
+ unsigned int source_idx;
unsigned int channel;
- int ret;
- for (channel = 0; channel < 4; channel++) {
- unsigned int source_idx = rvin_group_csi_channel_to_pad(channel);
- struct media_pad *source_pad = &source->pads[source_idx];
+ /*
+ * The channels from CSI-2 blocks and the VIN groups have a set of
+ * hardcoded routing options to choose from. We only support the routing
+ * where all VINs in a group are connected to the same CSI-2 block,
+ * and the Nth VIN in the group is connected to the Nth CSI-2 channel.
+ */
- /* Skip if link already exists. */
- if (media_entity_find_link(source_pad, sink_pad))
- continue;
+ channel = id % 4;
+ source_idx = rvin_group_csi_channel_to_pad(channel);
+ source_pad = &source->pads[source_idx];
- ret = media_create_pad_link(source, source_idx, sink, 0, 0);
- if (ret)
- return ret;
- }
+ /* Skip if link already exists. */
+ if (media_entity_find_link(source_pad, sink_pad))
+ return 0;
- return 0;
+ return media_create_pad_link(source, source_idx, sink, 0, 0);
}
static int rvin_parallel_setup_links(struct rvin_group *group)
--
2.43.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH v5 01/10] media: rcar-vin: Link VINs on Gen3 to a single channel on each CSI-2
2026-03-11 13:53 ` [PATCH v5 01/10] media: rcar-vin: Link VINs on Gen3 to a single channel on each CSI-2 Tomi Valkeinen
@ 2026-04-04 12:09 ` Niklas Söderlund
0 siblings, 0 replies; 21+ messages in thread
From: Niklas Söderlund @ 2026-04-04 12:09 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Mauro Carvalho Chehab, Sakari Ailus, linux-media,
linux-renesas-soc, linux-kernel, Mauro Carvalho Chehab,
Laurent Pinchart, Jacopo Mondi
Hi Tomi,
Thanks for your work.
On 2026-03-11 15:53:14 +0200, Tomi Valkeinen wrote:
> The stream routing will be fully configurable when we add full streams
> support to the rcar pipeline. Thus there is no need for the user to be
> able to link VINs to different CSI-2 channels. In fact, allowing e.g.
> VIN0 to be connected to CSI-2 channel 3 would be wrong, as the hardware
> doesn't allow that.
>
> Change rvin_csi2_create_link() so that it creates media links only
> between matching VINs and CSI-2 channels (VIN0 - channel 0, VIN1 -
> channel 1, etc.).
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
I think you should break this out of the streams series so we can merge
it before streams are enabled by default in the API.
> ---
> .../media/platform/renesas/rcar-vin/rcar-core.c | 27 ++++++++++++----------
> 1 file changed, 15 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-core.c b/drivers/media/platform/renesas/rcar-vin/rcar-core.c
> index c8d564aa1eba..2fcea715101c 100644
> --- a/drivers/media/platform/renesas/rcar-vin/rcar-core.c
> +++ b/drivers/media/platform/renesas/rcar-vin/rcar-core.c
> @@ -673,23 +673,26 @@ static int rvin_csi2_create_link(struct rvin_group *group, unsigned int id,
> struct media_entity *source = &group->remotes[route->csi].subdev->entity;
> struct media_entity *sink = &group->vin[id]->vdev.entity;
> struct media_pad *sink_pad = &sink->pads[0];
> + struct media_pad *source_pad;
> + unsigned int source_idx;
> unsigned int channel;
> - int ret;
>
> - for (channel = 0; channel < 4; channel++) {
> - unsigned int source_idx = rvin_group_csi_channel_to_pad(channel);
> - struct media_pad *source_pad = &source->pads[source_idx];
> + /*
> + * The channels from CSI-2 blocks and the VIN groups have a set of
> + * hardcoded routing options to choose from. We only support the routing
> + * where all VINs in a group are connected to the same CSI-2 block,
> + * and the Nth VIN in the group is connected to the Nth CSI-2 channel.
> + */
>
> - /* Skip if link already exists. */
> - if (media_entity_find_link(source_pad, sink_pad))
> - continue;
> + channel = id % 4;
> + source_idx = rvin_group_csi_channel_to_pad(channel);
> + source_pad = &source->pads[source_idx];
>
> - ret = media_create_pad_link(source, source_idx, sink, 0, 0);
> - if (ret)
> - return ret;
> - }
> + /* Skip if link already exists. */
> + if (media_entity_find_link(source_pad, sink_pad))
> + return 0;
>
> - return 0;
> + return media_create_pad_link(source, source_idx, sink, 0, 0);
> }
>
> static int rvin_parallel_setup_links(struct rvin_group *group)
>
> --
> 2.43.0
>
--
Kind Regards,
Niklas Söderlund
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v5 02/10] media: rcar-isp: Move {enable|disable}_streams() calls
2026-03-11 13:53 [PATCH v5 00/10] media: rcar: Streams support Tomi Valkeinen
2026-03-11 13:53 ` [PATCH v5 01/10] media: rcar-vin: Link VINs on Gen3 to a single channel on each CSI-2 Tomi Valkeinen
@ 2026-03-11 13:53 ` Tomi Valkeinen
2026-03-18 20:44 ` Laurent Pinchart
2026-03-11 13:53 ` [PATCH v5 03/10] media: rcar-csi2: " Tomi Valkeinen
` (9 subsequent siblings)
11 siblings, 1 reply; 21+ messages in thread
From: Tomi Valkeinen @ 2026-03-11 13:53 UTC (permalink / raw)
To: Niklas Söderlund, Mauro Carvalho Chehab, Sakari Ailus
Cc: linux-media, linux-renesas-soc, linux-kernel,
Niklas Söderlund, Mauro Carvalho Chehab, Laurent Pinchart,
Jacopo Mondi, Tomi Valkeinen
With multiple streams the operation to enable the ISP hardware and to
call {enable|disable}_streams() on upstream subdev will need to be
handled separately.
Prepare for that by moving {enable|disable}_streams() calls out from
risp_start() and risp_stop().
On Gen4, a side effect of this change is that if the sink side devices
call .enable_streams() on rcar-isp multiple times, the second call will
fail. This is because we always use stream ID 0, so the second call
would attempt to enable the same stream again, leading to an error. In
other words, a normal single-stream setup continues to work, but trying
to use the current driver's custom VC based routing will fail.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
---
drivers/media/platform/renesas/rcar-isp/csisp.c | 27 ++++++++++++++++---------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/drivers/media/platform/renesas/rcar-isp/csisp.c b/drivers/media/platform/renesas/rcar-isp/csisp.c
index 8fb2cc3b5650..58a9a3bd9f75 100644
--- a/drivers/media/platform/renesas/rcar-isp/csisp.c
+++ b/drivers/media/platform/renesas/rcar-isp/csisp.c
@@ -268,18 +268,11 @@ static int risp_start(struct rcar_isp *isp, struct v4l2_subdev_state *state)
/* Start ISP. */
risp_write_cs(isp, ISPSTART_REG, ISPSTART_START);
- ret = v4l2_subdev_enable_streams(isp->remote, isp->remote_pad,
- BIT_ULL(0));
- if (ret)
- risp_power_off(isp);
-
- return ret;
+ return 0;
}
static void risp_stop(struct rcar_isp *isp)
{
- v4l2_subdev_disable_streams(isp->remote, isp->remote_pad, BIT_ULL(0));
-
/* Stop ISP. */
risp_write_cs(isp, ISPSTART_REG, ISPSTART_STOP);
@@ -291,7 +284,7 @@ static int risp_enable_streams(struct v4l2_subdev *sd,
u64 source_streams_mask)
{
struct rcar_isp *isp = sd_to_isp(sd);
- int ret = 0;
+ int ret;
if (source_streams_mask != 1)
return -EINVAL;
@@ -305,9 +298,17 @@ static int risp_enable_streams(struct v4l2_subdev *sd,
return ret;
}
+ ret = v4l2_subdev_enable_streams(isp->remote, isp->remote_pad,
+ BIT_ULL(0));
+ if (ret) {
+ if (isp->stream_count == 0)
+ risp_stop(isp);
+ return ret;
+ }
+
isp->stream_count += 1;
- return ret;
+ return 0;
}
static int risp_disable_streams(struct v4l2_subdev *sd,
@@ -315,6 +316,7 @@ static int risp_disable_streams(struct v4l2_subdev *sd,
u64 source_streams_mask)
{
struct rcar_isp *isp = sd_to_isp(sd);
+ int ret;
if (source_streams_mask != 1)
return -EINVAL;
@@ -322,6 +324,11 @@ static int risp_disable_streams(struct v4l2_subdev *sd,
if (!isp->remote)
return -ENODEV;
+ ret = v4l2_subdev_disable_streams(isp->remote, isp->remote_pad,
+ BIT_ULL(0));
+ if (ret)
+ return ret;
+
if (isp->stream_count == 1)
risp_stop(isp);
--
2.43.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH v5 02/10] media: rcar-isp: Move {enable|disable}_streams() calls
2026-03-11 13:53 ` [PATCH v5 02/10] media: rcar-isp: Move {enable|disable}_streams() calls Tomi Valkeinen
@ 2026-03-18 20:44 ` Laurent Pinchart
0 siblings, 0 replies; 21+ messages in thread
From: Laurent Pinchart @ 2026-03-18 20:44 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Niklas Söderlund, Mauro Carvalho Chehab, Sakari Ailus,
linux-media, linux-renesas-soc, linux-kernel,
Niklas Söderlund, Mauro Carvalho Chehab, Jacopo Mondi
On Wed, Mar 11, 2026 at 03:53:15PM +0200, Tomi Valkeinen wrote:
> With multiple streams the operation to enable the ISP hardware and to
> call {enable|disable}_streams() on upstream subdev will need to be
> handled separately.
>
> Prepare for that by moving {enable|disable}_streams() calls out from
> risp_start() and risp_stop().
>
> On Gen4, a side effect of this change is that if the sink side devices
> call .enable_streams() on rcar-isp multiple times, the second call will
> fail. This is because we always use stream ID 0, so the second call
> would attempt to enable the same stream again, leading to an error. In
> other words, a normal single-stream setup continues to work, but trying
> to use the current driver's custom VC based routing will fail.
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
> drivers/media/platform/renesas/rcar-isp/csisp.c | 27 ++++++++++++++++---------
> 1 file changed, 17 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/media/platform/renesas/rcar-isp/csisp.c b/drivers/media/platform/renesas/rcar-isp/csisp.c
> index 8fb2cc3b5650..58a9a3bd9f75 100644
> --- a/drivers/media/platform/renesas/rcar-isp/csisp.c
> +++ b/drivers/media/platform/renesas/rcar-isp/csisp.c
> @@ -268,18 +268,11 @@ static int risp_start(struct rcar_isp *isp, struct v4l2_subdev_state *state)
> /* Start ISP. */
> risp_write_cs(isp, ISPSTART_REG, ISPSTART_START);
>
> - ret = v4l2_subdev_enable_streams(isp->remote, isp->remote_pad,
> - BIT_ULL(0));
> - if (ret)
> - risp_power_off(isp);
> -
> - return ret;
> + return 0;
> }
>
> static void risp_stop(struct rcar_isp *isp)
> {
> - v4l2_subdev_disable_streams(isp->remote, isp->remote_pad, BIT_ULL(0));
> -
> /* Stop ISP. */
> risp_write_cs(isp, ISPSTART_REG, ISPSTART_STOP);
>
> @@ -291,7 +284,7 @@ static int risp_enable_streams(struct v4l2_subdev *sd,
> u64 source_streams_mask)
> {
> struct rcar_isp *isp = sd_to_isp(sd);
> - int ret = 0;
> + int ret;
>
> if (source_streams_mask != 1)
> return -EINVAL;
> @@ -305,9 +298,17 @@ static int risp_enable_streams(struct v4l2_subdev *sd,
> return ret;
> }
>
> + ret = v4l2_subdev_enable_streams(isp->remote, isp->remote_pad,
> + BIT_ULL(0));
> + if (ret) {
> + if (isp->stream_count == 0)
> + risp_stop(isp);
> + return ret;
> + }
> +
> isp->stream_count += 1;
>
> - return ret;
> + return 0;
> }
>
> static int risp_disable_streams(struct v4l2_subdev *sd,
> @@ -315,6 +316,7 @@ static int risp_disable_streams(struct v4l2_subdev *sd,
> u64 source_streams_mask)
> {
> struct rcar_isp *isp = sd_to_isp(sd);
> + int ret;
>
> if (source_streams_mask != 1)
> return -EINVAL;
> @@ -322,6 +324,11 @@ static int risp_disable_streams(struct v4l2_subdev *sd,
> if (!isp->remote)
> return -ENODEV;
>
> + ret = v4l2_subdev_disable_streams(isp->remote, isp->remote_pad,
> + BIT_ULL(0));
> + if (ret)
> + return ret;
> +
> if (isp->stream_count == 1)
> risp_stop(isp);
>
>
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v5 03/10] media: rcar-csi2: Move {enable|disable}_streams() calls
2026-03-11 13:53 [PATCH v5 00/10] media: rcar: Streams support Tomi Valkeinen
2026-03-11 13:53 ` [PATCH v5 01/10] media: rcar-vin: Link VINs on Gen3 to a single channel on each CSI-2 Tomi Valkeinen
2026-03-11 13:53 ` [PATCH v5 02/10] media: rcar-isp: Move {enable|disable}_streams() calls Tomi Valkeinen
@ 2026-03-11 13:53 ` Tomi Valkeinen
2026-03-18 20:54 ` Laurent Pinchart
2026-03-11 13:53 ` [PATCH v5 04/10] media: rcar-csi2: Switch to Streams API Tomi Valkeinen
` (8 subsequent siblings)
11 siblings, 1 reply; 21+ messages in thread
From: Tomi Valkeinen @ 2026-03-11 13:53 UTC (permalink / raw)
To: Niklas Söderlund, Mauro Carvalho Chehab, Sakari Ailus
Cc: linux-media, linux-renesas-soc, linux-kernel,
Niklas Söderlund, Mauro Carvalho Chehab, Laurent Pinchart,
Jacopo Mondi, Tomi Valkeinen
With multiple streams the operation to enable the CSI-2 hardware and to
call {enable|disable}_streams() on upstream subdev will need to be
handled separately.
Prepare for that by moving {enable|disable}_streams() calls out from
rcsi2_start() and rcsi2_stop().
On Gen3, a side effect of this change is that if the sink side devices
call .enable_streams() on rcar-csi2 multiple times, the second call will
fail. This is because we always use stream ID 0, so the second call
would attempt to enable the same stream again, leading to an error. In
other words, a normal single-stream setup continues to work, but trying
to use the current driver's custom VC based routing will fail.
On Gen4, this doesn't matter as the rcar-isp behaves in a similar way as
described above, and thus rcar-csi2 will only get a single
.enable_streams() call.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
---
drivers/media/platform/renesas/rcar-csi2.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/platform/renesas/rcar-csi2.c
index 7305cc4a04cb..158fa447e668 100644
--- a/drivers/media/platform/renesas/rcar-csi2.c
+++ b/drivers/media/platform/renesas/rcar-csi2.c
@@ -1822,20 +1822,12 @@ static int rcsi2_start(struct rcar_csi2 *priv, struct v4l2_subdev_state *state)
return ret;
}
- ret = v4l2_subdev_enable_streams(priv->remote, priv->remote_pad,
- BIT_ULL(0));
- if (ret) {
- rcsi2_enter_standby(priv);
- return ret;
- }
-
return 0;
}
static void rcsi2_stop(struct rcar_csi2 *priv)
{
rcsi2_enter_standby(priv);
- v4l2_subdev_disable_streams(priv->remote, priv->remote_pad, BIT_ULL(0));
}
static int rcsi2_enable_streams(struct v4l2_subdev *sd,
@@ -1857,6 +1849,14 @@ static int rcsi2_enable_streams(struct v4l2_subdev *sd,
return ret;
}
+ ret = v4l2_subdev_enable_streams(priv->remote, priv->remote_pad,
+ BIT_ULL(0));
+ if (ret) {
+ if (priv->stream_count == 0)
+ rcsi2_stop(priv);
+ return ret;
+ }
+
priv->stream_count += 1;
return ret;
@@ -1867,7 +1867,7 @@ static int rcsi2_disable_streams(struct v4l2_subdev *sd,
u32 source_pad, u64 source_streams_mask)
{
struct rcar_csi2 *priv = sd_to_csi2(sd);
- int ret = 0;
+ int ret;
if (source_streams_mask != 1)
return -EINVAL;
@@ -1878,9 +1878,14 @@ static int rcsi2_disable_streams(struct v4l2_subdev *sd,
if (priv->stream_count == 1)
rcsi2_stop(priv);
+ ret = v4l2_subdev_disable_streams(priv->remote, priv->remote_pad,
+ BIT_ULL(0));
+ if (ret)
+ return ret;
+
priv->stream_count -= 1;
- return ret;
+ return 0;
}
static int rcsi2_set_pad_format(struct v4l2_subdev *sd,
--
2.43.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH v5 03/10] media: rcar-csi2: Move {enable|disable}_streams() calls
2026-03-11 13:53 ` [PATCH v5 03/10] media: rcar-csi2: " Tomi Valkeinen
@ 2026-03-18 20:54 ` Laurent Pinchart
2026-04-04 12:19 ` Niklas Söderlund
0 siblings, 1 reply; 21+ messages in thread
From: Laurent Pinchart @ 2026-03-18 20:54 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Niklas Söderlund, Mauro Carvalho Chehab, Sakari Ailus,
linux-media, linux-renesas-soc, linux-kernel,
Niklas Söderlund, Mauro Carvalho Chehab, Jacopo Mondi
On Wed, Mar 11, 2026 at 03:53:16PM +0200, Tomi Valkeinen wrote:
> With multiple streams the operation to enable the CSI-2 hardware and to
> call {enable|disable}_streams() on upstream subdev will need to be
> handled separately.
>
> Prepare for that by moving {enable|disable}_streams() calls out from
> rcsi2_start() and rcsi2_stop().
>
> On Gen3, a side effect of this change is that if the sink side devices
> call .enable_streams() on rcar-csi2 multiple times, the second call will
> fail. This is because we always use stream ID 0, so the second call
> would attempt to enable the same stream again, leading to an error. In
> other words, a normal single-stream setup continues to work, but trying
> to use the current driver's custom VC based routing will fail.
I assume this gets addressed later in the series.
>
> On Gen4, this doesn't matter as the rcar-isp behaves in a similar way as
> described above, and thus rcar-csi2 will only get a single
> .enable_streams() call.
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
> ---
> drivers/media/platform/renesas/rcar-csi2.c | 25 +++++++++++++++----------
> 1 file changed, 15 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/platform/renesas/rcar-csi2.c
> index 7305cc4a04cb..158fa447e668 100644
> --- a/drivers/media/platform/renesas/rcar-csi2.c
> +++ b/drivers/media/platform/renesas/rcar-csi2.c
> @@ -1822,20 +1822,12 @@ static int rcsi2_start(struct rcar_csi2 *priv, struct v4l2_subdev_state *state)
> return ret;
> }
>
> - ret = v4l2_subdev_enable_streams(priv->remote, priv->remote_pad,
> - BIT_ULL(0));
> - if (ret) {
> - rcsi2_enter_standby(priv);
> - return ret;
> - }
> -
> return 0;
> }
>
> static void rcsi2_stop(struct rcar_csi2 *priv)
> {
> rcsi2_enter_standby(priv);
> - v4l2_subdev_disable_streams(priv->remote, priv->remote_pad, BIT_ULL(0));
> }
>
> static int rcsi2_enable_streams(struct v4l2_subdev *sd,
> @@ -1857,6 +1849,14 @@ static int rcsi2_enable_streams(struct v4l2_subdev *sd,
> return ret;
> }
>
> + ret = v4l2_subdev_enable_streams(priv->remote, priv->remote_pad,
> + BIT_ULL(0));
> + if (ret) {
> + if (priv->stream_count == 0)
> + rcsi2_stop(priv);
> + return ret;
> + }
> +
> priv->stream_count += 1;
>
> return ret;
> @@ -1867,7 +1867,7 @@ static int rcsi2_disable_streams(struct v4l2_subdev *sd,
> u32 source_pad, u64 source_streams_mask)
> {
> struct rcar_csi2 *priv = sd_to_csi2(sd);
> - int ret = 0;
> + int ret;
>
> if (source_streams_mask != 1)
> return -EINVAL;
> @@ -1878,9 +1878,14 @@ static int rcsi2_disable_streams(struct v4l2_subdev *sd,
> if (priv->stream_count == 1)
> rcsi2_stop(priv);
>
> + ret = v4l2_subdev_disable_streams(priv->remote, priv->remote_pad,
> + BIT_ULL(0));
> + if (ret)
> + return ret;
> +
> priv->stream_count -= 1;
>
> - return ret;
> + return 0;
> }
rcsi2_irq_thread() also calls rcsi2_stop(), followed by rcsi2_start().
This is to handle errors reported by the AFIFO_OF, ERRSOTHS and
ERRSOTSYNCHS interrupts. If the source isn't restarted, such an attempt
to recover from errors will likely fail. On the other hand, restarting
the source will likely not lead to great results either.
Error handling was introduced in
commit 4ab44ff0841b9a825f9875623d24809d29e37a10
Author: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Date: Thu Apr 11 16:30:58 2019 -0400
media: rcar-csi2: restart CSI-2 link if error is detected
Restart the CSI-2 link if the CSI-2 receiver detects an error during
reception. The driver did nothing when a link error happened and the
data flow simply stopped without the user knowing why.
Change the driver to try and recover from errors by restarting the link
and informing the user that something is not right. For obvious reasons
it's not possible to recover from all errors (video source disconnected
for example) but in such cases the user is at least informed of the
error and the same behavior of the stopped data flow is retained.
Niklas, do you recall anything about the errors you saw ?
>
> static int rcsi2_set_pad_format(struct v4l2_subdev *sd,
>
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH v5 03/10] media: rcar-csi2: Move {enable|disable}_streams() calls
2026-03-18 20:54 ` Laurent Pinchart
@ 2026-04-04 12:19 ` Niklas Söderlund
0 siblings, 0 replies; 21+ messages in thread
From: Niklas Söderlund @ 2026-04-04 12:19 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Tomi Valkeinen, Mauro Carvalho Chehab, Sakari Ailus, linux-media,
linux-renesas-soc, linux-kernel, Mauro Carvalho Chehab,
Jacopo Mondi
Hello,
On 2026-03-18 22:54:35 +0200, Laurent Pinchart wrote:
> On Wed, Mar 11, 2026 at 03:53:16PM +0200, Tomi Valkeinen wrote:
> > With multiple streams the operation to enable the CSI-2 hardware and to
> > call {enable|disable}_streams() on upstream subdev will need to be
> > handled separately.
> >
> > Prepare for that by moving {enable|disable}_streams() calls out from
> > rcsi2_start() and rcsi2_stop().
> >
> > On Gen3, a side effect of this change is that if the sink side devices
> > call .enable_streams() on rcar-csi2 multiple times, the second call will
> > fail. This is because we always use stream ID 0, so the second call
> > would attempt to enable the same stream again, leading to an error. In
> > other words, a normal single-stream setup continues to work, but trying
> > to use the current driver's custom VC based routing will fail.
>
> I assume this gets addressed later in the series.
>
> >
> > On Gen4, this doesn't matter as the rcar-isp behaves in a similar way as
> > described above, and thus rcar-csi2 will only get a single
> > .enable_streams() call.
> >
> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
> > ---
> > drivers/media/platform/renesas/rcar-csi2.c | 25 +++++++++++++++----------
> > 1 file changed, 15 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/platform/renesas/rcar-csi2.c
> > index 7305cc4a04cb..158fa447e668 100644
> > --- a/drivers/media/platform/renesas/rcar-csi2.c
> > +++ b/drivers/media/platform/renesas/rcar-csi2.c
> > @@ -1822,20 +1822,12 @@ static int rcsi2_start(struct rcar_csi2 *priv, struct v4l2_subdev_state *state)
> > return ret;
> > }
> >
> > - ret = v4l2_subdev_enable_streams(priv->remote, priv->remote_pad,
> > - BIT_ULL(0));
> > - if (ret) {
> > - rcsi2_enter_standby(priv);
> > - return ret;
> > - }
> > -
> > return 0;
> > }
> >
> > static void rcsi2_stop(struct rcar_csi2 *priv)
> > {
> > rcsi2_enter_standby(priv);
> > - v4l2_subdev_disable_streams(priv->remote, priv->remote_pad, BIT_ULL(0));
> > }
> >
> > static int rcsi2_enable_streams(struct v4l2_subdev *sd,
> > @@ -1857,6 +1849,14 @@ static int rcsi2_enable_streams(struct v4l2_subdev *sd,
> > return ret;
> > }
> >
> > + ret = v4l2_subdev_enable_streams(priv->remote, priv->remote_pad,
> > + BIT_ULL(0));
> > + if (ret) {
> > + if (priv->stream_count == 0)
> > + rcsi2_stop(priv);
> > + return ret;
> > + }
> > +
> > priv->stream_count += 1;
> >
> > return ret;
> > @@ -1867,7 +1867,7 @@ static int rcsi2_disable_streams(struct v4l2_subdev *sd,
> > u32 source_pad, u64 source_streams_mask)
> > {
> > struct rcar_csi2 *priv = sd_to_csi2(sd);
> > - int ret = 0;
> > + int ret;
> >
> > if (source_streams_mask != 1)
> > return -EINVAL;
> > @@ -1878,9 +1878,14 @@ static int rcsi2_disable_streams(struct v4l2_subdev *sd,
> > if (priv->stream_count == 1)
> > rcsi2_stop(priv);
> >
> > + ret = v4l2_subdev_disable_streams(priv->remote, priv->remote_pad,
> > + BIT_ULL(0));
> > + if (ret)
> > + return ret;
> > +
> > priv->stream_count -= 1;
> >
> > - return ret;
> > + return 0;
> > }
>
> rcsi2_irq_thread() also calls rcsi2_stop(), followed by rcsi2_start().
> This is to handle errors reported by the AFIFO_OF, ERRSOTHS and
> ERRSOTSYNCHS interrupts. If the source isn't restarted, such an attempt
> to recover from errors will likely fail. On the other hand, restarting
> the source will likely not lead to great results either.
>
> Error handling was introduced in
>
> commit 4ab44ff0841b9a825f9875623d24809d29e37a10
> Author: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> Date: Thu Apr 11 16:30:58 2019 -0400
>
> media: rcar-csi2: restart CSI-2 link if error is detected
>
> Restart the CSI-2 link if the CSI-2 receiver detects an error during
> reception. The driver did nothing when a link error happened and the
> data flow simply stopped without the user knowing why.
>
> Change the driver to try and recover from errors by restarting the link
> and informing the user that something is not right. For obvious reasons
> it's not possible to recover from all errors (video source disconnected
> for example) but in such cases the user is at least informed of the
> error and the same behavior of the stopped data flow is retained.
>
> Niklas, do you recall anything about the errors you saw ?
IIRC, the spark for the work was a user report where the wish was to
handle detectable errors somehow instead of just silently fail. The
first try was this commit where the driver tries to recover. However as
you point out it might not be the optimal solution.
Instead I proposed a way to signal to user-space that there where a link
error and let it deal with it [1]. As seen on the date from that work it
kind of stalled. I still plan to resume that work once all the cleanups
of the R-Car VIN pipeline are done.
1. https://lore.kernel.org/linux-renesas-soc/20211108160220.767586-1-niklas.soderlund%2Brenesas@ragnatech.se/
>
> >
> > static int rcsi2_set_pad_format(struct v4l2_subdev *sd,
> >
>
> --
> Regards,
>
> Laurent Pinchart
--
Kind Regards,
Niklas Söderlund
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v5 04/10] media: rcar-csi2: Switch to Streams API
2026-03-11 13:53 [PATCH v5 00/10] media: rcar: Streams support Tomi Valkeinen
` (2 preceding siblings ...)
2026-03-11 13:53 ` [PATCH v5 03/10] media: rcar-csi2: " Tomi Valkeinen
@ 2026-03-11 13:53 ` Tomi Valkeinen
2026-03-18 21:04 ` Laurent Pinchart
2026-03-11 13:53 ` [PATCH v5 05/10] media: rcar-isp: " Tomi Valkeinen
` (7 subsequent siblings)
11 siblings, 1 reply; 21+ messages in thread
From: Tomi Valkeinen @ 2026-03-11 13:53 UTC (permalink / raw)
To: Niklas Söderlund, Mauro Carvalho Chehab, Sakari Ailus
Cc: linux-media, linux-renesas-soc, linux-kernel,
Niklas Söderlund, Mauro Carvalho Chehab, Laurent Pinchart,
Jacopo Mondi, Tomi Valkeinen
Switch to Streams API with a single hardcoded route.
For single-stream use case there should be no change in behavior.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
---
drivers/media/platform/renesas/rcar-csi2.c | 64 +++++++++++++++++++++++-------
1 file changed, 50 insertions(+), 14 deletions(-)
diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/platform/renesas/rcar-csi2.c
index 158fa447e668..ad62c95c8f9a 100644
--- a/drivers/media/platform/renesas/rcar-csi2.c
+++ b/drivers/media/platform/renesas/rcar-csi2.c
@@ -1023,17 +1023,24 @@ static int rcsi2_calc_mbps(struct rcar_csi2 *priv,
*/
freq = v4l2_get_link_freq(remote_pad, 0, 0);
if (freq < 0) {
+ const struct v4l2_subdev_route *route;
const struct rcar_csi2_format *format;
const struct v4l2_mbus_framefmt *fmt;
unsigned int lanes;
unsigned int bpp;
int ret;
+ if (state->routing.num_routes != 1)
+ return -EINVAL;
+
ret = rcsi2_get_active_lanes(priv, &lanes);
if (ret)
return ret;
- fmt = v4l2_subdev_state_get_format(state, RCAR_CSI2_SINK);
+ route = &state->routing.routes[0];
+
+ fmt = v4l2_subdev_state_get_format(state, route->sink_pad,
+ route->sink_stream);
if (!fmt)
return -EINVAL;
@@ -1062,6 +1069,7 @@ static int rcsi2_calc_mbps(struct rcar_csi2 *priv,
static int rcsi2_start_receiver_gen3(struct rcar_csi2 *priv,
struct v4l2_subdev_state *state)
{
+ const struct v4l2_subdev_route *route;
const struct rcar_csi2_format *format;
u32 phycnt, vcdt = 0, vcdt2 = 0, fld = 0;
const struct v4l2_mbus_framefmt *fmt;
@@ -1070,7 +1078,16 @@ static int rcsi2_start_receiver_gen3(struct rcar_csi2 *priv,
int mbps, ret;
/* Use the format on the sink pad to compute the receiver config. */
- fmt = v4l2_subdev_state_get_format(state, RCAR_CSI2_SINK);
+
+ if (state->routing.num_routes != 1)
+ return -EINVAL;
+
+ route = &state->routing.routes[0];
+
+ fmt = v4l2_subdev_state_get_format(state, route->sink_pad,
+ route->sink_stream);
+ if (!fmt)
+ return -EINVAL;
dev_dbg(priv->dev, "Input size (%ux%u%c)\n",
fmt->width, fmt->height,
@@ -1892,8 +1909,7 @@ static int rcsi2_set_pad_format(struct v4l2_subdev *sd,
struct v4l2_subdev_state *state,
struct v4l2_subdev_format *format)
{
- struct rcar_csi2 *priv = sd_to_csi2(sd);
- unsigned int num_pads = rcsi2_num_pads(priv);
+ struct v4l2_mbus_framefmt *fmt;
if (format->pad > RCAR_CSI2_SINK)
return v4l2_subdev_get_fmt(sd, state, format);
@@ -1901,11 +1917,20 @@ static int rcsi2_set_pad_format(struct v4l2_subdev *sd,
if (!rcsi2_code_to_fmt(format->format.code))
format->format.code = rcar_csi2_formats[0].code;
- *v4l2_subdev_state_get_format(state, format->pad) = format->format;
+ /* Set sink format. */
+ fmt = v4l2_subdev_state_get_format(state, format->pad, format->stream);
+ if (!fmt)
+ return -EINVAL;
+
+ *fmt = format->format;
+
+ /* Propagate the format to the source pad. */
+ fmt = v4l2_subdev_state_get_opposite_stream_format(state, format->pad,
+ format->stream);
+ if (!fmt)
+ return -EINVAL;
- /* Propagate the format to the source pads. */
- for (unsigned int i = RCAR_CSI2_SOURCE_VC0; i < num_pads; i++)
- *v4l2_subdev_state_get_format(state, i) = format->format;
+ *fmt = format->format;
return 0;
}
@@ -1925,8 +1950,15 @@ static const struct v4l2_subdev_ops rcar_csi2_subdev_ops = {
static int rcsi2_init_state(struct v4l2_subdev *sd,
struct v4l2_subdev_state *state)
{
- struct rcar_csi2 *priv = sd_to_csi2(sd);
- unsigned int num_pads = rcsi2_num_pads(priv);
+ static struct v4l2_subdev_route routes[] = {
+ {
+ .sink_pad = RCAR_CSI2_SINK,
+ .sink_stream = 0,
+ .source_pad = RCAR_CSI2_SOURCE_VC0,
+ .source_stream = 0,
+ .flags = V4L2_SUBDEV_ROUTE_FL_ACTIVE,
+ },
+ };
static const struct v4l2_mbus_framefmt rcar_csi2_default_fmt = {
.width = 1920,
@@ -1939,10 +1971,13 @@ static int rcsi2_init_state(struct v4l2_subdev *sd,
.xfer_func = V4L2_XFER_FUNC_DEFAULT,
};
- for (unsigned int i = RCAR_CSI2_SINK; i < num_pads; i++)
- *v4l2_subdev_state_get_format(state, i) = rcar_csi2_default_fmt;
+ static const struct v4l2_subdev_krouting routing = {
+ .num_routes = ARRAY_SIZE(routes),
+ .routes = routes,
+ };
- return 0;
+ return v4l2_subdev_set_routing_with_fmt(sd, state, &routing,
+ &rcar_csi2_default_fmt);
}
static const struct v4l2_subdev_internal_ops rcar_csi2_internal_ops = {
@@ -2599,7 +2634,8 @@ static int rcsi2_probe(struct platform_device *pdev)
v4l2_set_subdevdata(&priv->subdev, &pdev->dev);
snprintf(priv->subdev.name, sizeof(priv->subdev.name), "%s %s",
KBUILD_MODNAME, dev_name(&pdev->dev));
- priv->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;
+ priv->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE |
+ V4L2_SUBDEV_FL_STREAMS;
priv->subdev.entity.function = MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER;
priv->subdev.entity.ops = &rcar_csi2_entity_ops;
--
2.43.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH v5 04/10] media: rcar-csi2: Switch to Streams API
2026-03-11 13:53 ` [PATCH v5 04/10] media: rcar-csi2: Switch to Streams API Tomi Valkeinen
@ 2026-03-18 21:04 ` Laurent Pinchart
0 siblings, 0 replies; 21+ messages in thread
From: Laurent Pinchart @ 2026-03-18 21:04 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Niklas Söderlund, Mauro Carvalho Chehab, Sakari Ailus,
linux-media, linux-renesas-soc, linux-kernel,
Niklas Söderlund, Mauro Carvalho Chehab, Jacopo Mondi
On Wed, Mar 11, 2026 at 03:53:17PM +0200, Tomi Valkeinen wrote:
> Switch to Streams API with a single hardcoded route.
>
> For single-stream use case there should be no change in behavior.
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
> ---
> drivers/media/platform/renesas/rcar-csi2.c | 64 +++++++++++++++++++++++-------
> 1 file changed, 50 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/platform/renesas/rcar-csi2.c
> index 158fa447e668..ad62c95c8f9a 100644
> --- a/drivers/media/platform/renesas/rcar-csi2.c
> +++ b/drivers/media/platform/renesas/rcar-csi2.c
> @@ -1023,17 +1023,24 @@ static int rcsi2_calc_mbps(struct rcar_csi2 *priv,
> */
> freq = v4l2_get_link_freq(remote_pad, 0, 0);
> if (freq < 0) {
> + const struct v4l2_subdev_route *route;
> const struct rcar_csi2_format *format;
> const struct v4l2_mbus_framefmt *fmt;
> unsigned int lanes;
> unsigned int bpp;
> int ret;
>
> + if (state->routing.num_routes != 1)
> + return -EINVAL;
> +
> ret = rcsi2_get_active_lanes(priv, &lanes);
> if (ret)
> return ret;
>
> - fmt = v4l2_subdev_state_get_format(state, RCAR_CSI2_SINK);
> + route = &state->routing.routes[0];
> +
> + fmt = v4l2_subdev_state_get_format(state, route->sink_pad,
> + route->sink_stream);
> if (!fmt)
> return -EINVAL;
>
> @@ -1062,6 +1069,7 @@ static int rcsi2_calc_mbps(struct rcar_csi2 *priv,
> static int rcsi2_start_receiver_gen3(struct rcar_csi2 *priv,
> struct v4l2_subdev_state *state)
> {
> + const struct v4l2_subdev_route *route;
> const struct rcar_csi2_format *format;
> u32 phycnt, vcdt = 0, vcdt2 = 0, fld = 0;
> const struct v4l2_mbus_framefmt *fmt;
> @@ -1070,7 +1078,16 @@ static int rcsi2_start_receiver_gen3(struct rcar_csi2 *priv,
> int mbps, ret;
>
> /* Use the format on the sink pad to compute the receiver config. */
> - fmt = v4l2_subdev_state_get_format(state, RCAR_CSI2_SINK);
> +
> + if (state->routing.num_routes != 1)
> + return -EINVAL;
> +
> + route = &state->routing.routes[0];
> +
> + fmt = v4l2_subdev_state_get_format(state, route->sink_pad,
> + route->sink_stream);
> + if (!fmt)
> + return -EINVAL;
>
> dev_dbg(priv->dev, "Input size (%ux%u%c)\n",
> fmt->width, fmt->height,
> @@ -1892,8 +1909,7 @@ static int rcsi2_set_pad_format(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *state,
> struct v4l2_subdev_format *format)
> {
> - struct rcar_csi2 *priv = sd_to_csi2(sd);
> - unsigned int num_pads = rcsi2_num_pads(priv);
> + struct v4l2_mbus_framefmt *fmt;
>
> if (format->pad > RCAR_CSI2_SINK)
> return v4l2_subdev_get_fmt(sd, state, format);
> @@ -1901,11 +1917,20 @@ static int rcsi2_set_pad_format(struct v4l2_subdev *sd,
> if (!rcsi2_code_to_fmt(format->format.code))
> format->format.code = rcar_csi2_formats[0].code;
>
> - *v4l2_subdev_state_get_format(state, format->pad) = format->format;
> + /* Set sink format. */
> + fmt = v4l2_subdev_state_get_format(state, format->pad, format->stream);
> + if (!fmt)
> + return -EINVAL;
Can the call return NULL, isn't it checked by the subdev core already ?
> +
> + *fmt = format->format;
> +
> + /* Propagate the format to the source pad. */
> + fmt = v4l2_subdev_state_get_opposite_stream_format(state, format->pad,
> + format->stream);
> + if (!fmt)
> + return -EINVAL;
I wonder if this error check could be omitted too. If there's a format
for the sink stream, it means there's a route, so the opposite stream
format should be guaranteed to exist. Or maybe it's too late and I
should go to bed :-)
Looking at what other drivers do, they all check the return value of the
function, so let's keep it as-is for now.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
> - /* Propagate the format to the source pads. */
> - for (unsigned int i = RCAR_CSI2_SOURCE_VC0; i < num_pads; i++)
> - *v4l2_subdev_state_get_format(state, i) = format->format;
> + *fmt = format->format;
>
> return 0;
> }
> @@ -1925,8 +1950,15 @@ static const struct v4l2_subdev_ops rcar_csi2_subdev_ops = {
> static int rcsi2_init_state(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *state)
> {
> - struct rcar_csi2 *priv = sd_to_csi2(sd);
> - unsigned int num_pads = rcsi2_num_pads(priv);
> + static struct v4l2_subdev_route routes[] = {
> + {
> + .sink_pad = RCAR_CSI2_SINK,
> + .sink_stream = 0,
> + .source_pad = RCAR_CSI2_SOURCE_VC0,
> + .source_stream = 0,
> + .flags = V4L2_SUBDEV_ROUTE_FL_ACTIVE,
> + },
> + };
>
> static const struct v4l2_mbus_framefmt rcar_csi2_default_fmt = {
> .width = 1920,
> @@ -1939,10 +1971,13 @@ static int rcsi2_init_state(struct v4l2_subdev *sd,
> .xfer_func = V4L2_XFER_FUNC_DEFAULT,
> };
>
> - for (unsigned int i = RCAR_CSI2_SINK; i < num_pads; i++)
> - *v4l2_subdev_state_get_format(state, i) = rcar_csi2_default_fmt;
> + static const struct v4l2_subdev_krouting routing = {
> + .num_routes = ARRAY_SIZE(routes),
> + .routes = routes,
> + };
>
> - return 0;
> + return v4l2_subdev_set_routing_with_fmt(sd, state, &routing,
> + &rcar_csi2_default_fmt);
> }
>
> static const struct v4l2_subdev_internal_ops rcar_csi2_internal_ops = {
> @@ -2599,7 +2634,8 @@ static int rcsi2_probe(struct platform_device *pdev)
> v4l2_set_subdevdata(&priv->subdev, &pdev->dev);
> snprintf(priv->subdev.name, sizeof(priv->subdev.name), "%s %s",
> KBUILD_MODNAME, dev_name(&pdev->dev));
> - priv->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;
> + priv->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE |
> + V4L2_SUBDEV_FL_STREAMS;
>
> priv->subdev.entity.function = MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER;
> priv->subdev.entity.ops = &rcar_csi2_entity_ops;
>
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v5 05/10] media: rcar-isp: Switch to Streams API
2026-03-11 13:53 [PATCH v5 00/10] media: rcar: Streams support Tomi Valkeinen
` (3 preceding siblings ...)
2026-03-11 13:53 ` [PATCH v5 04/10] media: rcar-csi2: Switch to Streams API Tomi Valkeinen
@ 2026-03-11 13:53 ` Tomi Valkeinen
2026-03-18 21:12 ` Laurent Pinchart
2026-03-11 13:53 ` [PATCH v5 06/10] media: rcar-csi2: Add .get_frame_desc op Tomi Valkeinen
` (6 subsequent siblings)
11 siblings, 1 reply; 21+ messages in thread
From: Tomi Valkeinen @ 2026-03-11 13:53 UTC (permalink / raw)
To: Niklas Söderlund, Mauro Carvalho Chehab, Sakari Ailus
Cc: linux-media, linux-renesas-soc, linux-kernel,
Niklas Söderlund, Mauro Carvalho Chehab, Laurent Pinchart,
Jacopo Mondi, Tomi Valkeinen
Switch to Streams API with a single hardcoded route.
For single-stream use case there should be no change in behavior.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
---
drivers/media/platform/renesas/rcar-isp/csisp.c | 69 ++++++++++++++++++++++---
1 file changed, 62 insertions(+), 7 deletions(-)
diff --git a/drivers/media/platform/renesas/rcar-isp/csisp.c b/drivers/media/platform/renesas/rcar-isp/csisp.c
index 58a9a3bd9f75..8ac45516aa39 100644
--- a/drivers/media/platform/renesas/rcar-isp/csisp.c
+++ b/drivers/media/platform/renesas/rcar-isp/csisp.c
@@ -124,6 +124,17 @@ static const struct rcar_isp_format rcar_isp_formats[] = {
},
};
+static const struct v4l2_mbus_framefmt risp_default_fmt = {
+ .width = 1920,
+ .height = 1080,
+ .code = MEDIA_BUS_FMT_RGB888_1X24,
+ .colorspace = V4L2_COLORSPACE_SRGB,
+ .field = V4L2_FIELD_NONE,
+ .ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT,
+ .quantization = V4L2_QUANTIZATION_DEFAULT,
+ .xfer_func = V4L2_XFER_FUNC_DEFAULT,
+};
+
static const struct rcar_isp_format *risp_code_to_fmt(unsigned int code)
{
unsigned int i;
@@ -216,13 +227,20 @@ static void risp_power_off(struct rcar_isp *isp)
static int risp_start(struct rcar_isp *isp, struct v4l2_subdev_state *state)
{
+ const struct v4l2_subdev_route *route;
const struct v4l2_mbus_framefmt *fmt;
const struct rcar_isp_format *format;
unsigned int vc;
u32 sel_csi = 0;
int ret;
- fmt = v4l2_subdev_state_get_format(state, RCAR_ISP_SINK);
+ if (state->routing.num_routes != 1)
+ return -EINVAL;
+
+ route = &state->routing.routes[0];
+
+ fmt = v4l2_subdev_state_get_format(state, route->sink_pad,
+ route->sink_stream);
if (!fmt)
return -EINVAL;
@@ -341,7 +359,7 @@ static int risp_set_pad_format(struct v4l2_subdev *sd,
struct v4l2_subdev_state *state,
struct v4l2_subdev_format *format)
{
- struct v4l2_mbus_framefmt *framefmt;
+ struct v4l2_mbus_framefmt *fmt;
if (format->pad > RCAR_ISP_SINK)
return v4l2_subdev_get_fmt(sd, state, format);
@@ -349,10 +367,20 @@ static int risp_set_pad_format(struct v4l2_subdev *sd,
if (!risp_code_to_fmt(format->format.code))
format->format.code = rcar_isp_formats[0].code;
- for (unsigned int i = 0; i < RCAR_ISP_NUM_PADS; i++) {
- framefmt = v4l2_subdev_state_get_format(state, i);
- *framefmt = format->format;
- }
+ /* Set sink format. */
+ fmt = v4l2_subdev_state_get_format(state, format->pad, format->stream);
+ if (!fmt)
+ return -EINVAL;
+
+ *fmt = format->format;
+
+ /* Propagate the format to the source pad. */
+ fmt = v4l2_subdev_state_get_opposite_stream_format(state, format->pad,
+ format->stream);
+ if (!fmt)
+ return -EINVAL;
+
+ *fmt = format->format;
return 0;
}
@@ -369,6 +397,32 @@ static const struct v4l2_subdev_ops rcar_isp_subdev_ops = {
.pad = &risp_pad_ops,
};
+static int risp_init_state(struct v4l2_subdev *sd,
+ struct v4l2_subdev_state *state)
+{
+ static struct v4l2_subdev_route routes[] = {
+ {
+ .sink_pad = RCAR_ISP_SINK,
+ .sink_stream = 0,
+ .source_pad = RCAR_ISP_PORT0,
+ .source_stream = 0,
+ .flags = V4L2_SUBDEV_ROUTE_FL_ACTIVE,
+ },
+ };
+
+ static const struct v4l2_subdev_krouting routing = {
+ .num_routes = ARRAY_SIZE(routes),
+ .routes = routes,
+ };
+
+ return v4l2_subdev_set_routing_with_fmt(sd, state, &routing,
+ &risp_default_fmt);
+}
+
+static const struct v4l2_subdev_internal_ops risp_internal_ops = {
+ .init_state = risp_init_state,
+};
+
/* -----------------------------------------------------------------------------
* Async handling and registration of subdevices and links
*/
@@ -526,11 +580,12 @@ static int risp_probe(struct platform_device *pdev)
isp->subdev.owner = THIS_MODULE;
isp->subdev.dev = &pdev->dev;
+ isp->subdev.internal_ops = &risp_internal_ops;
v4l2_subdev_init(&isp->subdev, &rcar_isp_subdev_ops);
v4l2_set_subdevdata(&isp->subdev, &pdev->dev);
snprintf(isp->subdev.name, sizeof(isp->subdev.name), "%s %s",
KBUILD_MODNAME, dev_name(&pdev->dev));
- isp->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;
+ isp->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_STREAMS;
isp->subdev.entity.function = MEDIA_ENT_F_VID_MUX;
isp->subdev.entity.ops = &risp_entity_ops;
--
2.43.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH v5 05/10] media: rcar-isp: Switch to Streams API
2026-03-11 13:53 ` [PATCH v5 05/10] media: rcar-isp: " Tomi Valkeinen
@ 2026-03-18 21:12 ` Laurent Pinchart
0 siblings, 0 replies; 21+ messages in thread
From: Laurent Pinchart @ 2026-03-18 21:12 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Niklas Söderlund, Mauro Carvalho Chehab, Sakari Ailus,
linux-media, linux-renesas-soc, linux-kernel,
Niklas Söderlund, Mauro Carvalho Chehab, Jacopo Mondi
On Wed, Mar 11, 2026 at 03:53:18PM +0200, Tomi Valkeinen wrote:
> Switch to Streams API with a single hardcoded route.
>
> For single-stream use case there should be no change in behavior.
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
> drivers/media/platform/renesas/rcar-isp/csisp.c | 69 ++++++++++++++++++++++---
> 1 file changed, 62 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/media/platform/renesas/rcar-isp/csisp.c b/drivers/media/platform/renesas/rcar-isp/csisp.c
> index 58a9a3bd9f75..8ac45516aa39 100644
> --- a/drivers/media/platform/renesas/rcar-isp/csisp.c
> +++ b/drivers/media/platform/renesas/rcar-isp/csisp.c
> @@ -124,6 +124,17 @@ static const struct rcar_isp_format rcar_isp_formats[] = {
> },
> };
>
> +static const struct v4l2_mbus_framefmt risp_default_fmt = {
> + .width = 1920,
> + .height = 1080,
> + .code = MEDIA_BUS_FMT_RGB888_1X24,
> + .colorspace = V4L2_COLORSPACE_SRGB,
> + .field = V4L2_FIELD_NONE,
> + .ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT,
> + .quantization = V4L2_QUANTIZATION_DEFAULT,
> + .xfer_func = V4L2_XFER_FUNC_DEFAULT,
> +};
> +
> static const struct rcar_isp_format *risp_code_to_fmt(unsigned int code)
> {
> unsigned int i;
> @@ -216,13 +227,20 @@ static void risp_power_off(struct rcar_isp *isp)
>
> static int risp_start(struct rcar_isp *isp, struct v4l2_subdev_state *state)
> {
> + const struct v4l2_subdev_route *route;
> const struct v4l2_mbus_framefmt *fmt;
> const struct rcar_isp_format *format;
> unsigned int vc;
> u32 sel_csi = 0;
> int ret;
>
> - fmt = v4l2_subdev_state_get_format(state, RCAR_ISP_SINK);
> + if (state->routing.num_routes != 1)
> + return -EINVAL;
> +
> + route = &state->routing.routes[0];
> +
> + fmt = v4l2_subdev_state_get_format(state, route->sink_pad,
> + route->sink_stream);
> if (!fmt)
> return -EINVAL;
>
> @@ -341,7 +359,7 @@ static int risp_set_pad_format(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *state,
> struct v4l2_subdev_format *format)
> {
> - struct v4l2_mbus_framefmt *framefmt;
> + struct v4l2_mbus_framefmt *fmt;
>
> if (format->pad > RCAR_ISP_SINK)
> return v4l2_subdev_get_fmt(sd, state, format);
> @@ -349,10 +367,20 @@ static int risp_set_pad_format(struct v4l2_subdev *sd,
> if (!risp_code_to_fmt(format->format.code))
> format->format.code = rcar_isp_formats[0].code;
>
> - for (unsigned int i = 0; i < RCAR_ISP_NUM_PADS; i++) {
> - framefmt = v4l2_subdev_state_get_format(state, i);
> - *framefmt = format->format;
> - }
> + /* Set sink format. */
> + fmt = v4l2_subdev_state_get_format(state, format->pad, format->stream);
> + if (!fmt)
> + return -EINVAL;
> +
> + *fmt = format->format;
> +
> + /* Propagate the format to the source pad. */
> + fmt = v4l2_subdev_state_get_opposite_stream_format(state, format->pad,
> + format->stream);
> + if (!fmt)
> + return -EINVAL;
> +
> + *fmt = format->format;
>
> return 0;
> }
> @@ -369,6 +397,32 @@ static const struct v4l2_subdev_ops rcar_isp_subdev_ops = {
> .pad = &risp_pad_ops,
> };
>
> +static int risp_init_state(struct v4l2_subdev *sd,
> + struct v4l2_subdev_state *state)
> +{
> + static struct v4l2_subdev_route routes[] = {
> + {
> + .sink_pad = RCAR_ISP_SINK,
> + .sink_stream = 0,
> + .source_pad = RCAR_ISP_PORT0,
> + .source_stream = 0,
> + .flags = V4L2_SUBDEV_ROUTE_FL_ACTIVE,
> + },
> + };
> +
> + static const struct v4l2_subdev_krouting routing = {
> + .num_routes = ARRAY_SIZE(routes),
> + .routes = routes,
> + };
> +
> + return v4l2_subdev_set_routing_with_fmt(sd, state, &routing,
> + &risp_default_fmt);
> +}
> +
> +static const struct v4l2_subdev_internal_ops risp_internal_ops = {
> + .init_state = risp_init_state,
> +};
> +
> /* -----------------------------------------------------------------------------
> * Async handling and registration of subdevices and links
> */
> @@ -526,11 +580,12 @@ static int risp_probe(struct platform_device *pdev)
>
> isp->subdev.owner = THIS_MODULE;
> isp->subdev.dev = &pdev->dev;
> + isp->subdev.internal_ops = &risp_internal_ops;
> v4l2_subdev_init(&isp->subdev, &rcar_isp_subdev_ops);
> v4l2_set_subdevdata(&isp->subdev, &pdev->dev);
> snprintf(isp->subdev.name, sizeof(isp->subdev.name), "%s %s",
> KBUILD_MODNAME, dev_name(&pdev->dev));
> - isp->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;
> + isp->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_STREAMS;
>
> isp->subdev.entity.function = MEDIA_ENT_F_VID_MUX;
> isp->subdev.entity.ops = &risp_entity_ops;
>
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v5 06/10] media: rcar-csi2: Add .get_frame_desc op
2026-03-11 13:53 [PATCH v5 00/10] media: rcar: Streams support Tomi Valkeinen
` (4 preceding siblings ...)
2026-03-11 13:53 ` [PATCH v5 05/10] media: rcar-isp: " Tomi Valkeinen
@ 2026-03-11 13:53 ` Tomi Valkeinen
2026-03-18 21:16 ` Laurent Pinchart
2026-03-11 13:53 ` [PATCH v5 07/10] media: rcar-isp: Call get_frame_desc to find out VC & DT Tomi Valkeinen
` (5 subsequent siblings)
11 siblings, 1 reply; 21+ messages in thread
From: Tomi Valkeinen @ 2026-03-11 13:53 UTC (permalink / raw)
To: Niklas Söderlund, Mauro Carvalho Chehab, Sakari Ailus
Cc: linux-media, linux-renesas-soc, linux-kernel,
Niklas Söderlund, Mauro Carvalho Chehab, Laurent Pinchart,
Jacopo Mondi, Tomi Valkeinen
Add v4l2_subdev_pad_ops.get_frame_desc() implementation.
We also implement a fallback for the case where the upstream subdevice
does not implement .get_frame_desc. It assumes a single stream with VC =
0 and DT based on the configured stream mbus format.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
---
drivers/media/platform/renesas/rcar-csi2.c | 70 ++++++++++++++++++++++++++++++
1 file changed, 70 insertions(+)
diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/platform/renesas/rcar-csi2.c
index ad62c95c8f9a..b8baf7c65e90 100644
--- a/drivers/media/platform/renesas/rcar-csi2.c
+++ b/drivers/media/platform/renesas/rcar-csi2.c
@@ -1935,12 +1935,82 @@ static int rcsi2_set_pad_format(struct v4l2_subdev *sd,
return 0;
}
+static int rcsi2_get_frame_desc_fallback(struct v4l2_subdev *sd,
+ unsigned int pad,
+ struct v4l2_mbus_frame_desc *fd)
+{
+ struct v4l2_subdev_route *route;
+ const struct rcar_csi2_format *format;
+ struct v4l2_subdev_state *state;
+ struct v4l2_mbus_framefmt *fmt;
+ int ret = 0;
+
+ state = v4l2_subdev_lock_and_get_active_state(sd);
+
+ if (state->routing.num_routes != 1) {
+ ret = -EINVAL;
+ goto out;
+ }
+
+ route = &state->routing.routes[0];
+
+ if (route->source_pad != pad) {
+ ret = -EINVAL;
+ goto out;
+ }
+
+ fmt = v4l2_subdev_state_get_format(state, route->sink_pad,
+ route->sink_stream);
+ if (!fmt) {
+ ret = -EINVAL;
+ goto out;
+ }
+
+ format = rcsi2_code_to_fmt(fmt->code);
+ if (!format) {
+ ret = -EINVAL;
+ goto out;
+ }
+
+ fd->num_entries = 1;
+ fd->type = V4L2_MBUS_FRAME_DESC_TYPE_CSI2;
+ fd->entry[0].stream = route->source_stream;
+ fd->entry[0].pixelcode = fmt->code;
+ fd->entry[0].bus.csi2.vc = 0;
+ fd->entry[0].bus.csi2.dt = format->datatype;
+
+out:
+ v4l2_subdev_unlock_state(state);
+
+ return ret;
+}
+
+static int rcsi2_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad,
+ struct v4l2_mbus_frame_desc *fd)
+{
+ struct rcar_csi2 *priv = sd_to_csi2(sd);
+ int ret;
+
+ if (WARN_ON(!priv->info->use_isp))
+ return -ENOTTY;
+
+ if (WARN_ON(pad != RCAR_CSI2_SOURCE_VC0))
+ return -EINVAL;
+
+ ret = v4l2_subdev_get_frame_desc_passthrough(sd, pad, fd);
+ if (ret == -ENOIOCTLCMD)
+ ret = rcsi2_get_frame_desc_fallback(sd, pad, fd);
+ return ret;
+}
+
static const struct v4l2_subdev_pad_ops rcar_csi2_pad_ops = {
.enable_streams = rcsi2_enable_streams,
.disable_streams = rcsi2_disable_streams,
.set_fmt = rcsi2_set_pad_format,
.get_fmt = v4l2_subdev_get_fmt,
+
+ .get_frame_desc = rcsi2_get_frame_desc,
};
static const struct v4l2_subdev_ops rcar_csi2_subdev_ops = {
--
2.43.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH v5 06/10] media: rcar-csi2: Add .get_frame_desc op
2026-03-11 13:53 ` [PATCH v5 06/10] media: rcar-csi2: Add .get_frame_desc op Tomi Valkeinen
@ 2026-03-18 21:16 ` Laurent Pinchart
0 siblings, 0 replies; 21+ messages in thread
From: Laurent Pinchart @ 2026-03-18 21:16 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Niklas Söderlund, Mauro Carvalho Chehab, Sakari Ailus,
linux-media, linux-renesas-soc, linux-kernel,
Niklas Söderlund, Mauro Carvalho Chehab, Jacopo Mondi
On Wed, Mar 11, 2026 at 03:53:19PM +0200, Tomi Valkeinen wrote:
> Add v4l2_subdev_pad_ops.get_frame_desc() implementation.
>
> We also implement a fallback for the case where the upstream subdevice
> does not implement .get_frame_desc. It assumes a single stream with VC =
> 0 and DT based on the configured stream mbus format.
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
> ---
> drivers/media/platform/renesas/rcar-csi2.c | 70 ++++++++++++++++++++++++++++++
> 1 file changed, 70 insertions(+)
>
> diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/platform/renesas/rcar-csi2.c
> index ad62c95c8f9a..b8baf7c65e90 100644
> --- a/drivers/media/platform/renesas/rcar-csi2.c
> +++ b/drivers/media/platform/renesas/rcar-csi2.c
> @@ -1935,12 +1935,82 @@ static int rcsi2_set_pad_format(struct v4l2_subdev *sd,
> return 0;
> }
>
> +static int rcsi2_get_frame_desc_fallback(struct v4l2_subdev *sd,
> + unsigned int pad,
> + struct v4l2_mbus_frame_desc *fd)
> +{
> + struct v4l2_subdev_route *route;
> + const struct rcar_csi2_format *format;
> + struct v4l2_subdev_state *state;
> + struct v4l2_mbus_framefmt *fmt;
> + int ret = 0;
> +
> + state = v4l2_subdev_lock_and_get_active_state(sd);
> +
> + if (state->routing.num_routes != 1) {
> + ret = -EINVAL;
> + goto out;
> + }
> +
> + route = &state->routing.routes[0];
> +
> + if (route->source_pad != pad) {
> + ret = -EINVAL;
> + goto out;
> + }
> +
> + fmt = v4l2_subdev_state_get_format(state, route->sink_pad,
> + route->sink_stream);
> + if (!fmt) {
> + ret = -EINVAL;
> + goto out;
> + }
> +
> + format = rcsi2_code_to_fmt(fmt->code);
> + if (!format) {
> + ret = -EINVAL;
> + goto out;
> + }
> +
> + fd->num_entries = 1;
> + fd->type = V4L2_MBUS_FRAME_DESC_TYPE_CSI2;
> + fd->entry[0].stream = route->source_stream;
> + fd->entry[0].pixelcode = fmt->code;
> + fd->entry[0].bus.csi2.vc = 0;
> + fd->entry[0].bus.csi2.dt = format->datatype;
> +
> +out:
> + v4l2_subdev_unlock_state(state);
> +
> + return ret;
> +}
> +
> +static int rcsi2_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad,
> + struct v4l2_mbus_frame_desc *fd)
> +{
> + struct rcar_csi2 *priv = sd_to_csi2(sd);
> + int ret;
> +
> + if (WARN_ON(!priv->info->use_isp))
> + return -ENOTTY;
Why is that, can't the get frame desc operation be supported on Gen3 ?
> +
> + if (WARN_ON(pad != RCAR_CSI2_SOURCE_VC0))
> + return -EINVAL;
> +
> + ret = v4l2_subdev_get_frame_desc_passthrough(sd, pad, fd);
> + if (ret == -ENOIOCTLCMD)
> + ret = rcsi2_get_frame_desc_fallback(sd, pad, fd);
A dev_warn_once() would be good here, to get people to fix the source
device driver.
> + return ret;
> +}
> +
> static const struct v4l2_subdev_pad_ops rcar_csi2_pad_ops = {
> .enable_streams = rcsi2_enable_streams,
> .disable_streams = rcsi2_disable_streams,
>
> .set_fmt = rcsi2_set_pad_format,
> .get_fmt = v4l2_subdev_get_fmt,
> +
> + .get_frame_desc = rcsi2_get_frame_desc,
> };
>
> static const struct v4l2_subdev_ops rcar_csi2_subdev_ops = {
>
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v5 07/10] media: rcar-isp: Call get_frame_desc to find out VC & DT
2026-03-11 13:53 [PATCH v5 00/10] media: rcar: Streams support Tomi Valkeinen
` (5 preceding siblings ...)
2026-03-11 13:53 ` [PATCH v5 06/10] media: rcar-csi2: Add .get_frame_desc op Tomi Valkeinen
@ 2026-03-11 13:53 ` Tomi Valkeinen
2026-03-11 13:53 ` [PATCH v5 08/10] media: rcar-csi2: Call get_frame_desc to find out VC & DT (Gen3) Tomi Valkeinen
` (4 subsequent siblings)
11 siblings, 0 replies; 21+ messages in thread
From: Tomi Valkeinen @ 2026-03-11 13:53 UTC (permalink / raw)
To: Niklas Söderlund, Mauro Carvalho Chehab, Sakari Ailus
Cc: linux-media, linux-renesas-soc, linux-kernel,
Niklas Söderlund, Mauro Carvalho Chehab, Laurent Pinchart,
Jacopo Mondi, Tomi Valkeinen
Call get_frame_desc to find out VC & DT, instead of hardcoding the VC
routing and deducing the DT based on the mbus format.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
---
drivers/media/platform/renesas/rcar-isp/csisp.c | 110 ++++++++++++++++--------
1 file changed, 74 insertions(+), 36 deletions(-)
diff --git a/drivers/media/platform/renesas/rcar-isp/csisp.c b/drivers/media/platform/renesas/rcar-isp/csisp.c
index 8ac45516aa39..18d63731b6c0 100644
--- a/drivers/media/platform/renesas/rcar-isp/csisp.c
+++ b/drivers/media/platform/renesas/rcar-isp/csisp.c
@@ -42,6 +42,9 @@
#define ISPCS_DT_CODE03_EN0 BIT(7)
#define ISPCS_DT_CODE03_DT0(dt) ((dt) & 0x3f)
+/* ISP has 12 channels, of which channels 4 to 11 are connected to VINs */
+#define ISPCS_NUM_CHANNELS 12
+
struct rcar_isp_format {
u32 code;
unsigned int datatype;
@@ -225,31 +228,82 @@ static void risp_power_off(struct rcar_isp *isp)
pm_runtime_put(isp->dev);
}
-static int risp_start(struct rcar_isp *isp, struct v4l2_subdev_state *state)
+static int risp_configure_routing(struct rcar_isp *isp,
+ struct v4l2_subdev_state *state)
{
- const struct v4l2_subdev_route *route;
- const struct v4l2_mbus_framefmt *fmt;
- const struct rcar_isp_format *format;
- unsigned int vc;
- u32 sel_csi = 0;
+ struct v4l2_mbus_frame_desc source_fd;
+ struct v4l2_subdev_route *route;
int ret;
- if (state->routing.num_routes != 1)
- return -EINVAL;
+ ret = v4l2_subdev_call(isp->remote, pad, get_frame_desc,
+ isp->remote_pad, &source_fd);
+ if (ret)
+ return ret;
+
+ /* Clear the channel registers */
+ for (unsigned int ch = 0; ch < ISPCS_NUM_CHANNELS; ++ch) {
+ risp_write_cs(isp, ISPCS_FILTER_ID_CH_REG(ch), 0);
+ risp_write_cs(isp, ISPCS_DT_CODE03_CH_REG(ch), 0);
+ }
- route = &state->routing.routes[0];
+ for_each_active_route(&state->routing, route) {
+ struct v4l2_mbus_frame_desc_entry *source_entry = NULL;
+ const struct rcar_isp_format *format;
+ const struct v4l2_mbus_framefmt *fmt;
+ unsigned int i;
+ u8 vc, dt, ch;
+ u32 v;
+
+ for (i = 0; i < source_fd.num_entries; i++) {
+ if (source_fd.entry[i].stream == route->sink_stream) {
+ source_entry = &source_fd.entry[i];
+ break;
+ }
+ }
+
+ if (!source_entry) {
+ dev_err(isp->dev,
+ "Failed to find source frame desc entry for stream\n");
+ return -EPIPE;
+ }
+
+ vc = source_entry->bus.csi2.vc;
+ dt = source_entry->bus.csi2.dt;
+ /* Channels 4 - 11 go to VIN */
+ ch = route->source_pad - 1 + 4;
+
+ fmt = v4l2_subdev_state_get_format(state, route->sink_pad,
+ route->sink_stream);
+ if (!fmt)
+ return -EINVAL;
+
+ format = risp_code_to_fmt(fmt->code);
+ if (!format) {
+ dev_err(isp->dev, "Unsupported bus format\n");
+ return -EINVAL;
+ }
+
+ /* VC Filtering */
+ risp_write_cs(isp, ISPCS_FILTER_ID_CH_REG(ch), BIT(vc));
- fmt = v4l2_subdev_state_get_format(state, route->sink_pad,
- route->sink_stream);
- if (!fmt)
- return -EINVAL;
+ /* DT Filtering */
+ risp_write_cs(isp, ISPCS_DT_CODE03_CH_REG(ch),
+ ISPCS_DT_CODE03_EN0 | ISPCS_DT_CODE03_DT0(dt));
- format = risp_code_to_fmt(fmt->code);
- if (!format) {
- dev_err(isp->dev, "Unsupported bus format\n");
- return -EINVAL;
+ /* Proc mode */
+ v = risp_read_cs(isp, ISPPROCMODE_DT_REG(dt));
+ v |= ISPPROCMODE_DT_PROC_MODE_VCn(vc, format->procmode);
+ risp_write_cs(isp, ISPPROCMODE_DT_REG(dt), v);
}
+ return 0;
+}
+
+static int risp_start(struct rcar_isp *isp, struct v4l2_subdev_state *state)
+{
+ u32 sel_csi = 0;
+ int ret;
+
ret = risp_power_on(isp);
if (ret) {
dev_err(isp->dev, "Failed to power on ISP\n");
@@ -263,25 +317,9 @@ static int risp_start(struct rcar_isp *isp, struct v4l2_subdev_state *state)
risp_write_cs(isp, ISPINPUTSEL0_REG,
risp_read_cs(isp, ISPINPUTSEL0_REG) | sel_csi);
- /* Configure Channel Selector. */
- for (vc = 0; vc < 4; vc++) {
- u8 ch = vc + 4;
- u8 dt = format->datatype;
-
- risp_write_cs(isp, ISPCS_FILTER_ID_CH_REG(ch), BIT(vc));
- risp_write_cs(isp, ISPCS_DT_CODE03_CH_REG(ch),
- ISPCS_DT_CODE03_EN3 | ISPCS_DT_CODE03_DT3(dt) |
- ISPCS_DT_CODE03_EN2 | ISPCS_DT_CODE03_DT2(dt) |
- ISPCS_DT_CODE03_EN1 | ISPCS_DT_CODE03_DT1(dt) |
- ISPCS_DT_CODE03_EN0 | ISPCS_DT_CODE03_DT0(dt));
- }
-
- /* Setup processing method. */
- risp_write_cs(isp, ISPPROCMODE_DT_REG(format->datatype),
- ISPPROCMODE_DT_PROC_MODE_VCn(3, format->procmode) |
- ISPPROCMODE_DT_PROC_MODE_VCn(2, format->procmode) |
- ISPPROCMODE_DT_PROC_MODE_VCn(1, format->procmode) |
- ISPPROCMODE_DT_PROC_MODE_VCn(0, format->procmode));
+ ret = risp_configure_routing(isp, state);
+ if (ret)
+ return ret;
/* Start ISP. */
risp_write_cs(isp, ISPSTART_REG, ISPSTART_START);
--
2.43.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH v5 08/10] media: rcar-csi2: Call get_frame_desc to find out VC & DT (Gen3)
2026-03-11 13:53 [PATCH v5 00/10] media: rcar: Streams support Tomi Valkeinen
` (6 preceding siblings ...)
2026-03-11 13:53 ` [PATCH v5 07/10] media: rcar-isp: Call get_frame_desc to find out VC & DT Tomi Valkeinen
@ 2026-03-11 13:53 ` Tomi Valkeinen
2026-03-11 13:53 ` [PATCH v5 09/10] media: rcar-csi2: Add full streams support Tomi Valkeinen
` (3 subsequent siblings)
11 siblings, 0 replies; 21+ messages in thread
From: Tomi Valkeinen @ 2026-03-11 13:53 UTC (permalink / raw)
To: Niklas Söderlund, Mauro Carvalho Chehab, Sakari Ailus
Cc: linux-media, linux-renesas-soc, linux-kernel,
Niklas Söderlund, Mauro Carvalho Chehab, Laurent Pinchart,
Jacopo Mondi, Tomi Valkeinen
Call get_frame_desc to find out VC & DT, for Gen3 platforms, instead of
hardcoding the VC routing and deducing the DT based on the mbus format.
If the source subdevice doesn't implement .get_frame_desc, we use a
fallback case where we assume there's a single stream with VC = 0 and DT
based on the mbus format.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
---
drivers/media/platform/renesas/rcar-csi2.c | 111 ++++++++++++++++++-----------
1 file changed, 71 insertions(+), 40 deletions(-)
diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/platform/renesas/rcar-csi2.c
index b8baf7c65e90..831a5ec27233 100644
--- a/drivers/media/platform/renesas/rcar-csi2.c
+++ b/drivers/media/platform/renesas/rcar-csi2.c
@@ -1069,62 +1069,93 @@ static int rcsi2_calc_mbps(struct rcar_csi2 *priv,
static int rcsi2_start_receiver_gen3(struct rcar_csi2 *priv,
struct v4l2_subdev_state *state)
{
- const struct v4l2_subdev_route *route;
- const struct rcar_csi2_format *format;
- u32 phycnt, vcdt = 0, vcdt2 = 0, fld = 0;
- const struct v4l2_mbus_framefmt *fmt;
+ u32 phycnt, vcdt = 0, vcdt2 = 0;
+ u32 fld = FLD_DET_SEL(1);
+ struct v4l2_mbus_frame_desc source_fd;
+ struct v4l2_subdev_route *route;
unsigned int lanes;
- unsigned int i;
int mbps, ret;
+ u8 ch = 0;
- /* Use the format on the sink pad to compute the receiver config. */
+ ret = v4l2_subdev_call(priv->remote, pad, get_frame_desc,
+ priv->remote_pad, &source_fd);
+ if (ret && ret != -ENOIOCTLCMD)
+ return ret;
- if (state->routing.num_routes != 1)
- return -EINVAL;
+ if (ret == -ENOIOCTLCMD) {
+ /* Create a fallback source_fd */
+ struct v4l2_mbus_frame_desc *fd = &source_fd;
+ const struct v4l2_subdev_route *route;
+ const struct rcar_csi2_format *format;
+ struct v4l2_mbus_framefmt *fmt;
- route = &state->routing.routes[0];
+ if (state->routing.num_routes != 1)
+ return -EINVAL;
- fmt = v4l2_subdev_state_get_format(state, route->sink_pad,
- route->sink_stream);
- if (!fmt)
- return -EINVAL;
+ route = &state->routing.routes[0];
- dev_dbg(priv->dev, "Input size (%ux%u%c)\n",
- fmt->width, fmt->height,
- fmt->field == V4L2_FIELD_NONE ? 'p' : 'i');
+ fmt = v4l2_subdev_state_get_format(state, route->sink_pad,
+ route->sink_stream);
+ if (!fmt)
+ return -EINVAL;
- /* Code is validated in set_fmt. */
- format = rcsi2_code_to_fmt(fmt->code);
- if (!format)
- return -EINVAL;
+ format = rcsi2_code_to_fmt(fmt->code);
+ if (!format)
+ return -EINVAL;
- /*
- * Enable all supported CSI-2 channels with virtual channel and
- * data type matching.
- *
- * NOTE: It's not possible to get individual datatype for each
- * source virtual channel. Once this is possible in V4L2
- * it should be used here.
- */
- for (i = 0; i < priv->info->num_channels; i++) {
+ memset(fd, 0, sizeof(*fd));
+
+ fd->num_entries = 1;
+ fd->type = V4L2_MBUS_FRAME_DESC_TYPE_CSI2;
+ fd->entry[0].stream = 0;
+ fd->entry[0].pixelcode = fmt->code;
+ fd->entry[0].bus.csi2.vc = 0;
+ fd->entry[0].bus.csi2.dt = format->datatype;
+ }
+
+ for_each_active_route(&state->routing, route) {
+ const struct v4l2_mbus_frame_desc_entry *source_entry = NULL;
+ const struct v4l2_mbus_framefmt *fmt;
+ unsigned int i;
u32 vcdt_part;
- if (priv->channel_vc[i] < 0)
- continue;
+ for (i = 0; i < source_fd.num_entries; i++) {
+ if (source_fd.entry[i].stream == route->sink_stream) {
+ source_entry = &source_fd.entry[i];
+ break;
+ }
+ }
- vcdt_part = VCDT_SEL_VC(priv->channel_vc[i]) | VCDT_VCDTN_EN |
- VCDT_SEL_DTN_ON | VCDT_SEL_DT(format->datatype);
+ if (!source_entry) {
+ dev_err(priv->dev,
+ "Failed to find stream from source frame desc\n");
+ return -EPIPE;
+ }
+
+ vcdt_part = VCDT_SEL_VC(source_entry->bus.csi2.vc) |
+ VCDT_VCDTN_EN | VCDT_SEL_DTN_ON |
+ VCDT_SEL_DT(source_entry->bus.csi2.dt);
/* Store in correct reg and offset. */
- if (i < 2)
- vcdt |= vcdt_part << ((i % 2) * 16);
+ if (ch < 2)
+ vcdt |= vcdt_part << ((ch % 2) * 16);
else
- vcdt2 |= vcdt_part << ((i % 2) * 16);
- }
+ vcdt2 |= vcdt_part << ((ch % 2) * 16);
+
+ fmt = v4l2_subdev_state_get_format(state, RCAR_CSI2_SINK,
+ route->sink_stream);
+ if (!fmt)
+ return -EINVAL;
+
+ dev_dbg(priv->dev, "Input size (%ux%u%c)\n",
+ fmt->width, fmt->height,
+ fmt->field == V4L2_FIELD_NONE ? 'p' : 'i');
- if (fmt->field == V4L2_FIELD_ALTERNATE)
- fld = FLD_DET_SEL(1) | FLD_FLD_EN(3) | FLD_FLD_EN(2) |
- FLD_FLD_EN(1) | FLD_FLD_EN(0);
+ if (fmt->field == V4L2_FIELD_ALTERNATE)
+ fld |= FLD_FLD_EN(ch);
+
+ ch++;
+ }
/*
* Get the number of active data lanes inspecting the remote mbus
--
2.43.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH v5 09/10] media: rcar-csi2: Add full streams support
2026-03-11 13:53 [PATCH v5 00/10] media: rcar: Streams support Tomi Valkeinen
` (7 preceding siblings ...)
2026-03-11 13:53 ` [PATCH v5 08/10] media: rcar-csi2: Call get_frame_desc to find out VC & DT (Gen3) Tomi Valkeinen
@ 2026-03-11 13:53 ` Tomi Valkeinen
2026-03-11 13:53 ` [PATCH v5 10/10] media: rcar-isp: " Tomi Valkeinen
` (2 subsequent siblings)
11 siblings, 0 replies; 21+ messages in thread
From: Tomi Valkeinen @ 2026-03-11 13:53 UTC (permalink / raw)
To: Niklas Söderlund, Mauro Carvalho Chehab, Sakari Ailus
Cc: linux-media, linux-renesas-soc, linux-kernel,
Niklas Söderlund, Mauro Carvalho Chehab, Laurent Pinchart,
Jacopo Mondi, Tomi Valkeinen
Add the missing pieces to enable full streams support:
- Add set_routing
- Drop the explicit uses of a single stream, and instead use the streams
mask.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
---
drivers/media/platform/renesas/rcar-csi2.c | 75 ++++++++++++++++++++++--------
1 file changed, 55 insertions(+), 20 deletions(-)
diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/platform/renesas/rcar-csi2.c
index 831a5ec27233..04afde4fe195 100644
--- a/drivers/media/platform/renesas/rcar-csi2.c
+++ b/drivers/media/platform/renesas/rcar-csi2.c
@@ -702,6 +702,17 @@ static const struct rcar_csi2_format rcar_csi2_formats[] = {
},
};
+static const struct v4l2_mbus_framefmt rcar_csi2_default_fmt = {
+ .width = 1920,
+ .height = 1080,
+ .code = MEDIA_BUS_FMT_RGB888_1X24,
+ .colorspace = V4L2_COLORSPACE_SRGB,
+ .field = V4L2_FIELD_NONE,
+ .ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT,
+ .quantization = V4L2_QUANTIZATION_DEFAULT,
+ .xfer_func = V4L2_XFER_FUNC_DEFAULT,
+};
+
static const struct rcar_csi2_format *rcsi2_code_to_fmt(unsigned int code)
{
unsigned int i;
@@ -1883,10 +1894,8 @@ static int rcsi2_enable_streams(struct v4l2_subdev *sd,
u64 source_streams_mask)
{
struct rcar_csi2 *priv = sd_to_csi2(sd);
- int ret = 0;
-
- if (source_streams_mask != 1)
- return -EINVAL;
+ u64 sink_streams;
+ int ret;
if (!priv->remote)
return -ENODEV;
@@ -1897,8 +1906,13 @@ static int rcsi2_enable_streams(struct v4l2_subdev *sd,
return ret;
}
+ sink_streams = v4l2_subdev_state_xlate_streams(state,
+ RCAR_CSI2_SOURCE_VC0,
+ RCAR_CSI2_SINK,
+ &source_streams_mask);
+
ret = v4l2_subdev_enable_streams(priv->remote, priv->remote_pad,
- BIT_ULL(0));
+ sink_streams);
if (ret) {
if (priv->stream_count == 0)
rcsi2_stop(priv);
@@ -1915,19 +1929,22 @@ static int rcsi2_disable_streams(struct v4l2_subdev *sd,
u32 source_pad, u64 source_streams_mask)
{
struct rcar_csi2 *priv = sd_to_csi2(sd);
+ u64 sink_streams;
int ret;
- if (source_streams_mask != 1)
- return -EINVAL;
-
if (!priv->remote)
return -ENODEV;
if (priv->stream_count == 1)
rcsi2_stop(priv);
+ sink_streams = v4l2_subdev_state_xlate_streams(state,
+ RCAR_CSI2_SOURCE_VC0,
+ RCAR_CSI2_SINK,
+ &source_streams_mask);
+
ret = v4l2_subdev_disable_streams(priv->remote, priv->remote_pad,
- BIT_ULL(0));
+ sink_streams);
if (ret)
return ret;
@@ -1966,6 +1983,34 @@ static int rcsi2_set_pad_format(struct v4l2_subdev *sd,
return 0;
}
+static int rcsi2_set_routing(struct v4l2_subdev *sd,
+ struct v4l2_subdev_state *state,
+ enum v4l2_subdev_format_whence which,
+ struct v4l2_subdev_krouting *routing)
+{
+ struct rcar_csi2 *priv = sd_to_csi2(sd);
+ int ret;
+
+ if (priv->info->use_isp) {
+ ret = v4l2_subdev_routing_validate(sd, routing,
+ V4L2_SUBDEV_ROUTING_ONLY_1_TO_1);
+ } else {
+ ret = v4l2_subdev_routing_validate(sd, routing,
+ V4L2_SUBDEV_ROUTING_ONLY_1_TO_1 |
+ V4L2_SUBDEV_ROUTING_NO_SOURCE_MULTIPLEXING);
+ }
+
+ if (ret)
+ return ret;
+
+ ret = v4l2_subdev_set_routing_with_fmt(sd, state, routing,
+ &rcar_csi2_default_fmt);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
static int rcsi2_get_frame_desc_fallback(struct v4l2_subdev *sd,
unsigned int pad,
struct v4l2_mbus_frame_desc *fd)
@@ -2041,6 +2086,7 @@ static const struct v4l2_subdev_pad_ops rcar_csi2_pad_ops = {
.set_fmt = rcsi2_set_pad_format,
.get_fmt = v4l2_subdev_get_fmt,
+ .set_routing = rcsi2_set_routing,
.get_frame_desc = rcsi2_get_frame_desc,
};
@@ -2061,17 +2107,6 @@ static int rcsi2_init_state(struct v4l2_subdev *sd,
},
};
- static const struct v4l2_mbus_framefmt rcar_csi2_default_fmt = {
- .width = 1920,
- .height = 1080,
- .code = MEDIA_BUS_FMT_RGB888_1X24,
- .colorspace = V4L2_COLORSPACE_SRGB,
- .field = V4L2_FIELD_NONE,
- .ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT,
- .quantization = V4L2_QUANTIZATION_DEFAULT,
- .xfer_func = V4L2_XFER_FUNC_DEFAULT,
- };
-
static const struct v4l2_subdev_krouting routing = {
.num_routes = ARRAY_SIZE(routes),
.routes = routes,
--
2.43.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH v5 10/10] media: rcar-isp: Add full streams support
2026-03-11 13:53 [PATCH v5 00/10] media: rcar: Streams support Tomi Valkeinen
` (8 preceding siblings ...)
2026-03-11 13:53 ` [PATCH v5 09/10] media: rcar-csi2: Add full streams support Tomi Valkeinen
@ 2026-03-11 13:53 ` Tomi Valkeinen
2026-03-11 17:38 ` [PATCH v5 00/10] media: rcar: Streams support Niklas Söderlund
2026-03-18 20:33 ` Laurent Pinchart
11 siblings, 0 replies; 21+ messages in thread
From: Tomi Valkeinen @ 2026-03-11 13:53 UTC (permalink / raw)
To: Niklas Söderlund, Mauro Carvalho Chehab, Sakari Ailus
Cc: linux-media, linux-renesas-soc, linux-kernel,
Niklas Söderlund, Mauro Carvalho Chehab, Laurent Pinchart,
Jacopo Mondi, Tomi Valkeinen
Add the missing pieces to enable full streams support:
- Add set_routing
- Drop the explicit uses of a single stream, and instead use the streams
mask.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
---
drivers/media/platform/renesas/rcar-isp/csisp.c | 39 +++++++++++++++++++++++--
1 file changed, 36 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/renesas/rcar-isp/csisp.c b/drivers/media/platform/renesas/rcar-isp/csisp.c
index 18d63731b6c0..e4b9a6204815 100644
--- a/drivers/media/platform/renesas/rcar-isp/csisp.c
+++ b/drivers/media/platform/renesas/rcar-isp/csisp.c
@@ -340,6 +340,7 @@ static int risp_enable_streams(struct v4l2_subdev *sd,
u64 source_streams_mask)
{
struct rcar_isp *isp = sd_to_isp(sd);
+ u64 sink_streams;
int ret;
if (source_streams_mask != 1)
@@ -354,8 +355,13 @@ static int risp_enable_streams(struct v4l2_subdev *sd,
return ret;
}
+ sink_streams = v4l2_subdev_state_xlate_streams(state,
+ source_pad,
+ RCAR_ISP_SINK,
+ &source_streams_mask);
+
ret = v4l2_subdev_enable_streams(isp->remote, isp->remote_pad,
- BIT_ULL(0));
+ sink_streams);
if (ret) {
if (isp->stream_count == 0)
risp_stop(isp);
@@ -372,6 +378,7 @@ static int risp_disable_streams(struct v4l2_subdev *sd,
u64 source_streams_mask)
{
struct rcar_isp *isp = sd_to_isp(sd);
+ u64 sink_streams;
int ret;
if (source_streams_mask != 1)
@@ -380,8 +387,12 @@ static int risp_disable_streams(struct v4l2_subdev *sd,
if (!isp->remote)
return -ENODEV;
- ret = v4l2_subdev_disable_streams(isp->remote, isp->remote_pad,
- BIT_ULL(0));
+ sink_streams = v4l2_subdev_state_xlate_streams(state,
+ source_pad,
+ RCAR_ISP_SINK,
+ &source_streams_mask);
+
+ ret = v4l2_subdev_disable_streams(isp->remote, isp->remote_pad, sink_streams);
if (ret)
return ret;
@@ -423,12 +434,34 @@ static int risp_set_pad_format(struct v4l2_subdev *sd,
return 0;
}
+static int risp_set_routing(struct v4l2_subdev *sd,
+ struct v4l2_subdev_state *state,
+ enum v4l2_subdev_format_whence which,
+ struct v4l2_subdev_krouting *routing)
+{
+ int ret;
+
+ ret = v4l2_subdev_routing_validate(sd, routing,
+ V4L2_SUBDEV_ROUTING_ONLY_1_TO_1 |
+ V4L2_SUBDEV_ROUTING_NO_SOURCE_MULTIPLEXING);
+ if (ret)
+ return ret;
+
+ ret = v4l2_subdev_set_routing_with_fmt(sd, state, routing,
+ &risp_default_fmt);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
static const struct v4l2_subdev_pad_ops risp_pad_ops = {
.enable_streams = risp_enable_streams,
.disable_streams = risp_disable_streams,
.set_fmt = risp_set_pad_format,
.get_fmt = v4l2_subdev_get_fmt,
.link_validate = v4l2_subdev_link_validate_default,
+ .set_routing = risp_set_routing,
};
static const struct v4l2_subdev_ops rcar_isp_subdev_ops = {
--
2.43.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH v5 00/10] media: rcar: Streams support
2026-03-11 13:53 [PATCH v5 00/10] media: rcar: Streams support Tomi Valkeinen
` (9 preceding siblings ...)
2026-03-11 13:53 ` [PATCH v5 10/10] media: rcar-isp: " Tomi Valkeinen
@ 2026-03-11 17:38 ` Niklas Söderlund
2026-03-11 18:03 ` Tomi Valkeinen
2026-03-18 20:33 ` Laurent Pinchart
11 siblings, 1 reply; 21+ messages in thread
From: Niklas Söderlund @ 2026-03-11 17:38 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Mauro Carvalho Chehab, Sakari Ailus, linux-media,
linux-renesas-soc, linux-kernel, Mauro Carvalho Chehab,
Laurent Pinchart, Jacopo Mondi
Hi Tomi,
Thanks for your work.
On 2026-03-11 15:53:13 +0200, Tomi Valkeinen wrote:
> Add streams support to Renesas rcar platform driver.
>
> The series keaps compatibility with the current upstream for a single
> stream use case. However, in upstream there's a limited custom
> multi-stream support implemented to the rcar driver, which will be
> replaced with the upstream's Streams API.
>
> I have tested this series on Sparrow-Hawk board, with a few different
> setups:
>
> IMX219 connected to the CSI0 connector
> - The following patches applied to my test branch in addition to this
> series:
> 1) The v4l2_subdev_get_frame_desc_passthrough dependency
> 2) Revert of commit e7376745ad5c8548e31d9ea58adfb5a847e017a4 ("media:
> rcar-vin: Fix stride setting for RAW8 formats"), as that commit
> breaks RAW8
Is this still needed, was this not fixed by "[PATCH] media: renesas:
vin: Fix RAW8 (again)" ?
> - Tested with a single video stream
>
> IMX219 connected to the CSI0 connector
> - Plenty of other patches applied to enable full streams support and
> embedded data support in imx219 and v4l2 framework
> - Tested with video and embedded data streams
>
> Arducam FPD-Link board + 4 x IMX219 connected to the CSI0 connector
> - Plenty of other patches applied to enable full streams support and
> embedded data support in imx219 and v4l2 framework, and TPG support in
> ub953
> - Tested with video and embedded data streams from all four cameras (so
> 8 streams in total)
> - Also tested with ub953's TPG, combined with video & embedded streams
> from other cameras.
>
> I have observed one issue with the embedded data (i.e. requiring bunch
> of patches not in upstream): when stopping streaming, VIN says that it
> cannot stop the stream. I haven't debugged that, but a possible issue is
> that the if the video stream for the imx219 is stopped first, the
> embedded data stops also, and VIN does not get the frame-end it is
> waiting for.
>
> Tomi
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
> ---
> Changes in v5:
> - Rebase on v7.0-rc2, with the streams preparation series and
> get_frame_desc_passthrough series as dependencies
> - This series is now smaller, as the non-streams parts are in the
> streams preparation series
> - Fix "variable ‘format’ set but not used" warning
> - Link to v4: https://lore.kernel.org/r/20251216-rcar-streams-v4-0-f28b4831cc67@ideasonboard.com
>
> Changes in v4:
> - Rebased on v6.18, with minor conflicts resolved
> - Improved patch descriptions
> - Re-ordered the patches a bit to move changes that could be applied
> without the full streams support to the beginning of the series
> - Added "media: rcar-vin: Link VINs on Gen3 to a single channel on each
> CSI-2" which removes possibility of wrong routing config on Gen3
> - Added "media: rcar-csi2: Improve FLD_FLD_EN macros" which was part of
> another patch in v3
> - Addressed minor comments (constifyings, cosmetics)
> - Fixed the missing stream_count checks in disable_streams ops
> - Fixed a few instances in csisp and csi2 where
> v4l2_subdev_state_get_format() was called with hardcoded pad/stream,
> instead of using the data from the route
> - Dropped unnecessary ISPPROCMODE_DT_REG register clears
> - Squashed "media: rcar-csi2: Add more stream support to
> rcsi2_calc_mbps()" into a previous patch
> - Dropped wrong use_isp check from csi2's rcsi2_set_routing()
> - Link to v3: https://lore.kernel.org/r/20250530-rcar-streams-v3-0-026655df7138@ideasonboard.com
>
> Changes in v3:
> - Rebased on top of latest linux-media
> - Dropped dependencies which are already in linux-media (only remaining
> dependency is v4l2_subdev_get_frame_desc_passthrough)
> - Tested on white-hawk board, using the staging deser TPG
> - Also tested in a WIP branch for GMSL2 (two video streams)
> - Link to v2: https://lore.kernel.org/r/20250326-rcar-streams-v2-0-d0d7002c641f@ideasonboard.com
>
> Changes in v2:
> - Rebased on top of latest upstream, and updated the dependencies to
> match the latest serieses sent.
> - Add new patch "media: rcar-csi2: Use the pad version of v4l2_get_link_freq()"
> - Drop "media: rcar-csi2: Fix typo" (it was not a typo)
> - Update the code in calc_mbps(). The previous method relied on
> V4L2_CID_LINK_FREQ, but that's not available if the link-freq is
> provided via get_mbus_config().
> - Dropped dependencies to Niklas' old series which doesn't apply
> cleanly. It's needed for multi-stream, but not for the current
> upstream which only has a single stream use case.
> - Link to v1: https://lore.kernel.org/r/20250219-rcar-streams-v1-0-f1b93e370aab@ideasonboard.com
>
> ---
> Tomi Valkeinen (10):
> media: rcar-vin: Link VINs on Gen3 to a single channel on each CSI-2
> media: rcar-isp: Move {enable|disable}_streams() calls
> media: rcar-csi2: Move {enable|disable}_streams() calls
> media: rcar-csi2: Switch to Streams API
> media: rcar-isp: Switch to Streams API
> media: rcar-csi2: Add .get_frame_desc op
> media: rcar-isp: Call get_frame_desc to find out VC & DT
> media: rcar-csi2: Call get_frame_desc to find out VC & DT (Gen3)
> media: rcar-csi2: Add full streams support
> media: rcar-isp: Add full streams support
>
> drivers/media/platform/renesas/rcar-csi2.c | 323 ++++++++++++++++-----
> drivers/media/platform/renesas/rcar-isp/csisp.c | 227 ++++++++++++---
> .../media/platform/renesas/rcar-vin/rcar-core.c | 27 +-
> 3 files changed, 445 insertions(+), 132 deletions(-)
> ---
> base-commit: 9fad1d148df6f36105159c2503d0ecb1397bc89a
> change-id: 20250219-rcar-streams-1fdea8860e5e
> prerequisite-change-id: 20260115-rcar-streams-prep-1-1cc285538848:v1
> prerequisite-patch-id: 78155acff7a40c74881accca6d9699476405e937
> prerequisite-patch-id: 983b909c5d3667711baf2112713eac7862e5f9e7
> prerequisite-patch-id: 6dba98cf21fb95029009733448075ee0380eaf16
> prerequisite-patch-id: db9ed82262cd02a2cb6941dc30f731b6b7c4410c
> prerequisite-patch-id: 2342bc950678d13b5aa41b2faa276ad1c0e3d850
> prerequisite-change-id: 20250218-frame-desc-passthrough-66805e413974:v5
> prerequisite-patch-id: 4b1733536cdc5b2bdd3c996032273c576228da72
> prerequisite-patch-id: 69b75e7dad9ced905cb39a72f18bebbf3e8f998a
> prerequisite-patch-id: 58463f6944c76acd6cf203b14a2836cdb0db2461
>
> Best regards,
> --
> Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
>
--
Kind Regards,
Niklas Söderlund
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH v5 00/10] media: rcar: Streams support
2026-03-11 17:38 ` [PATCH v5 00/10] media: rcar: Streams support Niklas Söderlund
@ 2026-03-11 18:03 ` Tomi Valkeinen
0 siblings, 0 replies; 21+ messages in thread
From: Tomi Valkeinen @ 2026-03-11 18:03 UTC (permalink / raw)
To: Niklas Söderlund
Cc: Mauro Carvalho Chehab, Sakari Ailus, linux-media,
linux-renesas-soc, linux-kernel, Mauro Carvalho Chehab,
Laurent Pinchart, Jacopo Mondi
Hi,
On 11/03/2026 19:38, Niklas Söderlund wrote:
> Hi Tomi,
>
> Thanks for your work.
>
> On 2026-03-11 15:53:13 +0200, Tomi Valkeinen wrote:
>> Add streams support to Renesas rcar platform driver.
>>
>> The series keaps compatibility with the current upstream for a single
>> stream use case. However, in upstream there's a limited custom
>> multi-stream support implemented to the rcar driver, which will be
>> replaced with the upstream's Streams API.
>>
>> I have tested this series on Sparrow-Hawk board, with a few different
>> setups:
>>
>> IMX219 connected to the CSI0 connector
>> - The following patches applied to my test branch in addition to this
>> series:
>> 1) The v4l2_subdev_get_frame_desc_passthrough dependency
>> 2) Revert of commit e7376745ad5c8548e31d9ea58adfb5a847e017a4 ("media:
>> rcar-vin: Fix stride setting for RAW8 formats"), as that commit
>> breaks RAW8
>
> Is this still needed, was this not fixed by "[PATCH] media: renesas:
> vin: Fix RAW8 (again)" ?
Indeed, not needed, the "Fix RAW8 (again)" solves it.
Tomi
>
>> - Tested with a single video stream
>>
>> IMX219 connected to the CSI0 connector
>> - Plenty of other patches applied to enable full streams support and
>> embedded data support in imx219 and v4l2 framework
>> - Tested with video and embedded data streams
>>
>> Arducam FPD-Link board + 4 x IMX219 connected to the CSI0 connector
>> - Plenty of other patches applied to enable full streams support and
>> embedded data support in imx219 and v4l2 framework, and TPG support in
>> ub953
>> - Tested with video and embedded data streams from all four cameras (so
>> 8 streams in total)
>> - Also tested with ub953's TPG, combined with video & embedded streams
>> from other cameras.
>>
>> I have observed one issue with the embedded data (i.e. requiring bunch
>> of patches not in upstream): when stopping streaming, VIN says that it
>> cannot stop the stream. I haven't debugged that, but a possible issue is
>> that the if the video stream for the imx219 is stopped first, the
>> embedded data stops also, and VIN does not get the frame-end it is
>> waiting for.
>>
>> Tomi
>>
>> Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
>> ---
>> Changes in v5:
>> - Rebase on v7.0-rc2, with the streams preparation series and
>> get_frame_desc_passthrough series as dependencies
>> - This series is now smaller, as the non-streams parts are in the
>> streams preparation series
>> - Fix "variable ‘format’ set but not used" warning
>> - Link to v4: https://lore.kernel.org/r/20251216-rcar-streams-v4-0-f28b4831cc67@ideasonboard.com
>>
>> Changes in v4:
>> - Rebased on v6.18, with minor conflicts resolved
>> - Improved patch descriptions
>> - Re-ordered the patches a bit to move changes that could be applied
>> without the full streams support to the beginning of the series
>> - Added "media: rcar-vin: Link VINs on Gen3 to a single channel on each
>> CSI-2" which removes possibility of wrong routing config on Gen3
>> - Added "media: rcar-csi2: Improve FLD_FLD_EN macros" which was part of
>> another patch in v3
>> - Addressed minor comments (constifyings, cosmetics)
>> - Fixed the missing stream_count checks in disable_streams ops
>> - Fixed a few instances in csisp and csi2 where
>> v4l2_subdev_state_get_format() was called with hardcoded pad/stream,
>> instead of using the data from the route
>> - Dropped unnecessary ISPPROCMODE_DT_REG register clears
>> - Squashed "media: rcar-csi2: Add more stream support to
>> rcsi2_calc_mbps()" into a previous patch
>> - Dropped wrong use_isp check from csi2's rcsi2_set_routing()
>> - Link to v3: https://lore.kernel.org/r/20250530-rcar-streams-v3-0-026655df7138@ideasonboard.com
>>
>> Changes in v3:
>> - Rebased on top of latest linux-media
>> - Dropped dependencies which are already in linux-media (only remaining
>> dependency is v4l2_subdev_get_frame_desc_passthrough)
>> - Tested on white-hawk board, using the staging deser TPG
>> - Also tested in a WIP branch for GMSL2 (two video streams)
>> - Link to v2: https://lore.kernel.org/r/20250326-rcar-streams-v2-0-d0d7002c641f@ideasonboard.com
>>
>> Changes in v2:
>> - Rebased on top of latest upstream, and updated the dependencies to
>> match the latest serieses sent.
>> - Add new patch "media: rcar-csi2: Use the pad version of v4l2_get_link_freq()"
>> - Drop "media: rcar-csi2: Fix typo" (it was not a typo)
>> - Update the code in calc_mbps(). The previous method relied on
>> V4L2_CID_LINK_FREQ, but that's not available if the link-freq is
>> provided via get_mbus_config().
>> - Dropped dependencies to Niklas' old series which doesn't apply
>> cleanly. It's needed for multi-stream, but not for the current
>> upstream which only has a single stream use case.
>> - Link to v1: https://lore.kernel.org/r/20250219-rcar-streams-v1-0-f1b93e370aab@ideasonboard.com
>>
>> ---
>> Tomi Valkeinen (10):
>> media: rcar-vin: Link VINs on Gen3 to a single channel on each CSI-2
>> media: rcar-isp: Move {enable|disable}_streams() calls
>> media: rcar-csi2: Move {enable|disable}_streams() calls
>> media: rcar-csi2: Switch to Streams API
>> media: rcar-isp: Switch to Streams API
>> media: rcar-csi2: Add .get_frame_desc op
>> media: rcar-isp: Call get_frame_desc to find out VC & DT
>> media: rcar-csi2: Call get_frame_desc to find out VC & DT (Gen3)
>> media: rcar-csi2: Add full streams support
>> media: rcar-isp: Add full streams support
>>
>> drivers/media/platform/renesas/rcar-csi2.c | 323 ++++++++++++++++-----
>> drivers/media/platform/renesas/rcar-isp/csisp.c | 227 ++++++++++++---
>> .../media/platform/renesas/rcar-vin/rcar-core.c | 27 +-
>> 3 files changed, 445 insertions(+), 132 deletions(-)
>> ---
>> base-commit: 9fad1d148df6f36105159c2503d0ecb1397bc89a
>> change-id: 20250219-rcar-streams-1fdea8860e5e
>> prerequisite-change-id: 20260115-rcar-streams-prep-1-1cc285538848:v1
>> prerequisite-patch-id: 78155acff7a40c74881accca6d9699476405e937
>> prerequisite-patch-id: 983b909c5d3667711baf2112713eac7862e5f9e7
>> prerequisite-patch-id: 6dba98cf21fb95029009733448075ee0380eaf16
>> prerequisite-patch-id: db9ed82262cd02a2cb6941dc30f731b6b7c4410c
>> prerequisite-patch-id: 2342bc950678d13b5aa41b2faa276ad1c0e3d850
>> prerequisite-change-id: 20250218-frame-desc-passthrough-66805e413974:v5
>> prerequisite-patch-id: 4b1733536cdc5b2bdd3c996032273c576228da72
>> prerequisite-patch-id: 69b75e7dad9ced905cb39a72f18bebbf3e8f998a
>> prerequisite-patch-id: 58463f6944c76acd6cf203b14a2836cdb0db2461
>>
>> Best regards,
>> --
>> Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
>>
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v5 00/10] media: rcar: Streams support
2026-03-11 13:53 [PATCH v5 00/10] media: rcar: Streams support Tomi Valkeinen
` (10 preceding siblings ...)
2026-03-11 17:38 ` [PATCH v5 00/10] media: rcar: Streams support Niklas Söderlund
@ 2026-03-18 20:33 ` Laurent Pinchart
11 siblings, 0 replies; 21+ messages in thread
From: Laurent Pinchart @ 2026-03-18 20:33 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Niklas Söderlund, Mauro Carvalho Chehab, Sakari Ailus,
linux-media, linux-renesas-soc, linux-kernel,
Niklas Söderlund, Mauro Carvalho Chehab, Jacopo Mondi
On Wed, Mar 11, 2026 at 03:53:13PM +0200, Tomi Valkeinen wrote:
> Add streams support to Renesas rcar platform driver.
>
> The series keaps compatibility with the current upstream for a single
> stream use case. However, in upstream there's a limited custom
> multi-stream support implemented to the rcar driver, which will be
> replaced with the upstream's Streams API.
>
> I have tested this series on Sparrow-Hawk board, with a few different
> setups:
>
> IMX219 connected to the CSI0 connector
> - The following patches applied to my test branch in addition to this
> series:
> 1) The v4l2_subdev_get_frame_desc_passthrough dependency
> 2) Revert of commit e7376745ad5c8548e31d9ea58adfb5a847e017a4 ("media:
> rcar-vin: Fix stride setting for RAW8 formats"), as that commit
> breaks RAW8
> - Tested with a single video stream
>
> IMX219 connected to the CSI0 connector
> - Plenty of other patches applied to enable full streams support and
> embedded data support in imx219 and v4l2 framework
> - Tested with video and embedded data streams
>
> Arducam FPD-Link board + 4 x IMX219 connected to the CSI0 connector
> - Plenty of other patches applied to enable full streams support and
> embedded data support in imx219 and v4l2 framework, and TPG support in
> ub953
> - Tested with video and embedded data streams from all four cameras (so
> 8 streams in total)
> - Also tested with ub953's TPG, combined with video & embedded streams
> from other cameras.
>
> I have observed one issue with the embedded data (i.e. requiring bunch
> of patches not in upstream): when stopping streaming, VIN says that it
> cannot stop the stream. I haven't debugged that, but a possible issue is
> that the if the video stream for the imx219 is stopped first, the
> embedded data stops also, and VIN does not get the frame-end it is
> waiting for.
That sounds plausible, we'll need to investigate it.
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
> ---
> Changes in v5:
> - Rebase on v7.0-rc2, with the streams preparation series and
> get_frame_desc_passthrough series as dependencies
> - This series is now smaller, as the non-streams parts are in the
> streams preparation series
> - Fix "variable ‘format’ set but not used" warning
> - Link to v4: https://lore.kernel.org/r/20251216-rcar-streams-v4-0-f28b4831cc67@ideasonboard.com
>
> Changes in v4:
> - Rebased on v6.18, with minor conflicts resolved
> - Improved patch descriptions
> - Re-ordered the patches a bit to move changes that could be applied
> without the full streams support to the beginning of the series
> - Added "media: rcar-vin: Link VINs on Gen3 to a single channel on each
> CSI-2" which removes possibility of wrong routing config on Gen3
> - Added "media: rcar-csi2: Improve FLD_FLD_EN macros" which was part of
> another patch in v3
> - Addressed minor comments (constifyings, cosmetics)
> - Fixed the missing stream_count checks in disable_streams ops
> - Fixed a few instances in csisp and csi2 where
> v4l2_subdev_state_get_format() was called with hardcoded pad/stream,
> instead of using the data from the route
> - Dropped unnecessary ISPPROCMODE_DT_REG register clears
> - Squashed "media: rcar-csi2: Add more stream support to
> rcsi2_calc_mbps()" into a previous patch
> - Dropped wrong use_isp check from csi2's rcsi2_set_routing()
> - Link to v3: https://lore.kernel.org/r/20250530-rcar-streams-v3-0-026655df7138@ideasonboard.com
>
> Changes in v3:
> - Rebased on top of latest linux-media
> - Dropped dependencies which are already in linux-media (only remaining
> dependency is v4l2_subdev_get_frame_desc_passthrough)
> - Tested on white-hawk board, using the staging deser TPG
> - Also tested in a WIP branch for GMSL2 (two video streams)
> - Link to v2: https://lore.kernel.org/r/20250326-rcar-streams-v2-0-d0d7002c641f@ideasonboard.com
>
> Changes in v2:
> - Rebased on top of latest upstream, and updated the dependencies to
> match the latest serieses sent.
> - Add new patch "media: rcar-csi2: Use the pad version of v4l2_get_link_freq()"
> - Drop "media: rcar-csi2: Fix typo" (it was not a typo)
> - Update the code in calc_mbps(). The previous method relied on
> V4L2_CID_LINK_FREQ, but that's not available if the link-freq is
> provided via get_mbus_config().
> - Dropped dependencies to Niklas' old series which doesn't apply
> cleanly. It's needed for multi-stream, but not for the current
> upstream which only has a single stream use case.
> - Link to v1: https://lore.kernel.org/r/20250219-rcar-streams-v1-0-f1b93e370aab@ideasonboard.com
>
> ---
> Tomi Valkeinen (10):
> media: rcar-vin: Link VINs on Gen3 to a single channel on each CSI-2
> media: rcar-isp: Move {enable|disable}_streams() calls
> media: rcar-csi2: Move {enable|disable}_streams() calls
> media: rcar-csi2: Switch to Streams API
> media: rcar-isp: Switch to Streams API
> media: rcar-csi2: Add .get_frame_desc op
> media: rcar-isp: Call get_frame_desc to find out VC & DT
> media: rcar-csi2: Call get_frame_desc to find out VC & DT (Gen3)
> media: rcar-csi2: Add full streams support
> media: rcar-isp: Add full streams support
>
> drivers/media/platform/renesas/rcar-csi2.c | 323 ++++++++++++++++-----
> drivers/media/platform/renesas/rcar-isp/csisp.c | 227 ++++++++++++---
> .../media/platform/renesas/rcar-vin/rcar-core.c | 27 +-
> 3 files changed, 445 insertions(+), 132 deletions(-)
> ---
> base-commit: 9fad1d148df6f36105159c2503d0ecb1397bc89a
> change-id: 20250219-rcar-streams-1fdea8860e5e
> prerequisite-change-id: 20260115-rcar-streams-prep-1-1cc285538848:v1
> prerequisite-patch-id: 78155acff7a40c74881accca6d9699476405e937
> prerequisite-patch-id: 983b909c5d3667711baf2112713eac7862e5f9e7
> prerequisite-patch-id: 6dba98cf21fb95029009733448075ee0380eaf16
> prerequisite-patch-id: db9ed82262cd02a2cb6941dc30f731b6b7c4410c
> prerequisite-patch-id: 2342bc950678d13b5aa41b2faa276ad1c0e3d850
> prerequisite-change-id: 20250218-frame-desc-passthrough-66805e413974:v5
> prerequisite-patch-id: 4b1733536cdc5b2bdd3c996032273c576228da72
> prerequisite-patch-id: 69b75e7dad9ced905cb39a72f18bebbf3e8f998a
> prerequisite-patch-id: 58463f6944c76acd6cf203b14a2836cdb0db2461
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 21+ messages in thread