On 06/05/2023 00:52, Sakari Ailus wrote:
Take the new INTERNAL_SOURCE pad flag into account in validating routing
IOCTL argument. Effectively this is a SINK pad in this respect. Due to the
union there's no need to check for the particular name.
What union? The one you add in the next patch?
As a concept the internal source pads sound good, and they work in
practice in my tests. But this union is what grates me a bit. We have a
flag, MEDIA_PAD_FL_INTERNAL_SOURCE, which tells which field of the union
to use, and then we go and do not use the new union field. Well, and
also the naming, as we normally have source and sink pads, but now we
also have internal source pads, which are actually identical to sink pads...
I understand the idea and reasoning, but the two points above do confuse
me and I'm sure would confuse others also.
I wonder if it would be less or more confusing to simplify this by just
adding a MEDIA_PAD_FL_INTERNAL, which could be applied to either a
source or a sink pad, and would prevent linking to it. The flag would
indicate that the stream from/to that pad is generated/consumed
internally. (I don't know when you would need an internal pad to consume
data, but... who knows, the need might pop up =).
That would mean that an "internal sink pad" would generate a data
stream, i.e. it's a "source", but I think a normal sink pad is almost
the same anyway: when considering entity's internal routing, the normal
sink pad is a "source", and the same logic would apply with the internal
pads too.
An internal sink pad that generates a stream is a bit more confusing
than an internal source pad, but I think that confusion is less than the
rest of the confusion in the code-side that comes with the internal
source pads.
Tomi
Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
---
drivers/media/v4l2-core/v4l2-subdev.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index 2ec179cd1264..6312fc2bf1f0 100644
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -906,7 +906,8 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg,
return -EINVAL;
if (!(pads[route->sink_pad].flags &
- MEDIA_PAD_FL_SINK))
+ (MEDIA_PAD_FL_SINK |
+ MEDIA_PAD_FL_INTERNAL_SOURCE)))
return -EINVAL;
if (route->source_pad >= sd->entity.num_pads)
@@ -1787,7 +1788,8 @@ int v4l2_subdev_routing_validate(struct v4l2_subdev *sd,
/* Validate the sink and source pad numbers. */
if (route->sink_pad >= sd->entity.num_pads ||
- !(sd->entity.pads[route->sink_pad].flags & MEDIA_PAD_FL_SINK)) {
+ !(sd->entity.pads[route->sink_pad].flags &
+ (MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_INTERNAL_SOURCE))) {
dev_dbg(sd->dev, "route %u sink (%u) is not a sink pad\n",
i, route->sink_pad);
goto out;
