1. Patchew
  2. linux
  3. [PATCH v3 00/15] media: rcar: Streams support
  4. View patch

[PATCH v3 15/15] media: rcar-isp: Add full streams support

Tomi Valkeinen posted 15 patches 6 months, 2 weeks ago
There is a newer version of this series
[PATCH v3 15/15] media: rcar-isp: Add full streams support
Posted by Tomi Valkeinen 6 months, 2 weeks ago 
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 | 41 +++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/renesas/rcar-isp/csisp.c b/drivers/media/platform/renesas/rcar-isp/csisp.c
index 887d8eb21a3a..101d69a2eba4 100644
--- a/drivers/media/platform/renesas/rcar-isp/csisp.c
+++ b/drivers/media/platform/renesas/rcar-isp/csisp.c
@@ -342,6 +342,7 @@ static int risp_enable_streams(struct v4l2_subdev *sd,
 {
 	struct rcar_isp *isp = sd_to_isp(sd);
 	int ret = 0;
+	u64 sink_streams;
 
 	if (source_streams_mask != 1)
 		return -EINVAL;
@@ -355,8 +356,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) {
 		risp_stop(isp);
 		return ret;
@@ -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;
 
 	if (source_streams_mask != 1)
 		return -EINVAL;
@@ -379,7 +386,12 @@ static int risp_disable_streams(struct v4l2_subdev *sd,
 	if (!isp->remote)
 		return -ENODEV;
 
-	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);
+
+	v4l2_subdev_disable_streams(isp->remote, isp->remote_pad, sink_streams);
 
 	if (isp->stream_count == 1)
 		risp_stop(isp);
@@ -419,12 +431,37 @@ 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;
+
+	if (routing->num_routes > V4L2_FRAME_DESC_ENTRY_MAX)
+		return -EINVAL;
+
+	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
Re: [PATCH v3 15/15] media: rcar-isp: Add full streams support
Posted by Laurent Pinchart 6 months, 2 weeks ago 
Hi Tomi,

Thank you for the patch.

On Fri, May 30, 2025 at 04:50:44PM +0300, Tomi Valkeinen wrote:
> 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 | 41 +++++++++++++++++++++++--
>  1 file changed, 39 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/platform/renesas/rcar-isp/csisp.c b/drivers/media/platform/renesas/rcar-isp/csisp.c
> index 887d8eb21a3a..101d69a2eba4 100644
> --- a/drivers/media/platform/renesas/rcar-isp/csisp.c
> +++ b/drivers/media/platform/renesas/rcar-isp/csisp.c
> @@ -342,6 +342,7 @@ static int risp_enable_streams(struct v4l2_subdev *sd,
>  {
>  	struct rcar_isp *isp = sd_to_isp(sd);
>  	int ret = 0;
> +	u64 sink_streams;

I'd move this before ret.

>  
>  	if (source_streams_mask != 1)
>  		return -EINVAL;
> @@ -355,8 +356,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) {
>  		risp_stop(isp);
>  		return ret;
> @@ -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;
>  
>  	if (source_streams_mask != 1)
>  		return -EINVAL;
> @@ -379,7 +386,12 @@ static int risp_disable_streams(struct v4l2_subdev *sd,
>  	if (!isp->remote)
>  		return -ENODEV;
>  
> -	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);
> +
> +	v4l2_subdev_disable_streams(isp->remote, isp->remote_pad, sink_streams);
>  
>  	if (isp->stream_count == 1)
>  		risp_stop(isp);
> @@ -419,12 +431,37 @@ 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;
> +
> +	if (routing->num_routes > V4L2_FRAME_DESC_ENTRY_MAX)
> +		return -EINVAL;
> +
> +	ret = v4l2_subdev_routing_validate(sd, routing,
> +					   V4L2_SUBDEV_ROUTING_ONLY_1_TO_1 |
> +					   V4L2_SUBDEV_ROUTING_NO_SOURCE_MULTIPLEXING);

Given V4L2_SUBDEV_ROUTING_NO_SOURCE_MULTIPLEXING, shouldn't the
num_routes check be replaced by an intrinsic hardware limit (I would
guess 8, as that's the number of source pads) ?

> +	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 = {

-- 
Regards,

Laurent Pinchart
Re: [PATCH v3 15/15] media: rcar-isp: Add full streams support
Posted by Tomi Valkeinen 9 hours ago 
Hi,

On 02/06/2025 16:57, Laurent Pinchart wrote:
> Hi Tomi,
> 
> Thank you for the patch.
> 
> On Fri, May 30, 2025 at 04:50:44PM +0300, Tomi Valkeinen wrote:
>> 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 | 41 +++++++++++++++++++++++--
>>  1 file changed, 39 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/media/platform/renesas/rcar-isp/csisp.c b/drivers/media/platform/renesas/rcar-isp/csisp.c
>> index 887d8eb21a3a..101d69a2eba4 100644
>> --- a/drivers/media/platform/renesas/rcar-isp/csisp.c
>> +++ b/drivers/media/platform/renesas/rcar-isp/csisp.c
>> @@ -342,6 +342,7 @@ static int risp_enable_streams(struct v4l2_subdev *sd,
>>  {
>>  	struct rcar_isp *isp = sd_to_isp(sd);
>>  	int ret = 0;
>> +	u64 sink_streams;
> 
> I'd move this before ret.

Sure.

>>  
>>  	if (source_streams_mask != 1)
>>  		return -EINVAL;
>> @@ -355,8 +356,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) {
>>  		risp_stop(isp);
>>  		return ret;
>> @@ -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;
>>  
>>  	if (source_streams_mask != 1)
>>  		return -EINVAL;
>> @@ -379,7 +386,12 @@ static int risp_disable_streams(struct v4l2_subdev *sd,
>>  	if (!isp->remote)
>>  		return -ENODEV;
>>  
>> -	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);
>> +
>> +	v4l2_subdev_disable_streams(isp->remote, isp->remote_pad, sink_streams);
>>  
>>  	if (isp->stream_count == 1)
>>  		risp_stop(isp);
>> @@ -419,12 +431,37 @@ 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;
>> +
>> +	if (routing->num_routes > V4L2_FRAME_DESC_ENTRY_MAX)
>> +		return -EINVAL;
>> +
>> +	ret = v4l2_subdev_routing_validate(sd, routing,
>> +					   V4L2_SUBDEV_ROUTING_ONLY_1_TO_1 |
>> +					   V4L2_SUBDEV_ROUTING_NO_SOURCE_MULTIPLEXING);
> 
> Given V4L2_SUBDEV_ROUTING_NO_SOURCE_MULTIPLEXING, shouldn't the
> num_routes check be replaced by an intrinsic hardware limit (I would
> guess 8, as that's the number of source pads) ?

I've dropped the V4L2_FRAME_DESC_ENTRY_MAX check, as it's now in the
framework.

I don't think we should need any extra checks. If we have
V4L2_SUBDEV_ROUTING_NO_SOURCE_MULTIPLEXING, it should implicitly limit
the sources to the number of pads, shouldn't it?

 Tomi

>> +	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 = {
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.