From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
To: linux-media@vger.kernel.org, sakari.ailus@linux.intel.com,
Jacopo Mondi <jacopo+renesas@jmondi.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
niklas.soderlund+renesas@ragnatech.se,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Pratyush Yadav <p.yadav@ti.com>
Cc: Michal Simek <michal.simek@xilinx.com>,
Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Subject: [PATCH v11 10/36] media: entity: Use routing information during graph traversal
Date: Tue, 1 Mar 2022 18:11:30 +0200 [thread overview]
Message-ID: <20220301161156.1119557-11-tomi.valkeinen@ideasonboard.com> (raw)
In-Reply-To: <20220301161156.1119557-1-tomi.valkeinen@ideasonboard.com>
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Take internal routing information as reported by the entity has_route
operation into account during graph traversal to avoid following
unrelated links.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
drivers/media/mc/mc-entity.c | 46 ++++++++++++++++++++++--------------
1 file changed, 28 insertions(+), 18 deletions(-)
diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c
index 1ae9252b1b39..323e44d16f7b 100644
--- a/drivers/media/mc/mc-entity.c
+++ b/drivers/media/mc/mc-entity.c
@@ -243,15 +243,6 @@ static bool media_entity_has_route(struct media_entity *entity,
return entity->ops->has_route(entity, pad0, pad1);
}
-static struct media_pad *
-media_pad_other(struct media_pad *pad, struct media_link *link)
-{
- if (link->source == pad)
- return link->sink;
- else
- return link->source;
-}
-
/* push an entity to traversal stack */
static void stack_push(struct media_graph *graph, struct media_pad *pad)
{
@@ -322,7 +313,8 @@ static void media_graph_walk_iter(struct media_graph *graph)
{
struct media_pad *pad = stack_top(graph);
struct media_link *link;
- struct media_pad *next;
+ struct media_pad *remote;
+ struct media_pad *local;
link = list_entry(link_top(graph), typeof(*link), list);
@@ -336,24 +328,42 @@ static void media_graph_walk_iter(struct media_graph *graph)
return;
}
- /* Get the entity at the other end of the link. */
- next = media_pad_other(pad, link);
+ /*
+ * Get the local pad, the remote pad and the entity at the other
+ * end of the link.
+ */
+ if (link->source->entity == pad->entity) {
+ remote = link->sink;
+ local = link->source;
+ } else {
+ remote = link->source;
+ local = link->sink;
+ }
+
+ /*
+ * Are the local pad and the pad we came from connected
+ * internally in the entity ?
+ */
+ if (!media_entity_has_route(pad->entity, pad->index, local->index)) {
+ link_top(graph) = link_top(graph)->next;
+ return;
+ }
/* Has the entity already been visited? */
- if (media_entity_enum_test_and_set(&graph->ent_enum, next->entity)) {
+ if (media_entity_enum_test_and_set(&graph->ent_enum, remote->entity)) {
link_top(graph) = link_top(graph)->next;
dev_dbg(pad->graph_obj.mdev->dev,
"walk: skipping entity '%s' (already seen)\n",
- next->entity->name);
+ remote->entity->name);
return;
}
/* Push the new entity to stack and start over. */
link_top(graph) = link_top(graph)->next;
- stack_push(graph, next);
- dev_dbg(next->graph_obj.mdev->dev, "walk: pushing '%s':%u on stack\n",
- next->entity->name, next->index);
- lockdep_assert_held(&next->graph_obj.mdev->graph_mutex);
+ stack_push(graph, remote);
+ dev_dbg(remote->graph_obj.mdev->dev, "walk: pushing '%s':%u on stack\n",
+ remote->entity->name, remote->index);
+ lockdep_assert_held(&remote->graph_obj.mdev->graph_mutex);
}
struct media_pad *media_graph_walk_next(struct media_graph *graph)
--
2.25.1
next prev parent reply other threads:[~2022-03-01 16:12 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-01 16:11 [PATCH v11 00/36] v4l: routing and streams support Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 01/36] media: entity: Use pad as a starting point for graph walk Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 02/36] media: entity: Use pads instead of entities in the media graph walk stack Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 03/36] media: entity: Walk the graph based on pads Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 04/36] media: mc: Start walk from a specific pad in use count calculation Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 05/36] media: entity: Add iterator helper for entity pads Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 06/36] media: entity: Move the pipeline from entity to pads Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 07/36] media: entity: Use pad as the starting point for a pipeline Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 08/36] media: entity: Add has_route entity operation Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 09/36] media: entity: Add media_entity_has_route() function Tomi Valkeinen
2022-03-01 16:11 ` Tomi Valkeinen [this message]
2022-03-01 16:11 ` [PATCH v11 11/36] media: entity: Skip link validation for pads to which there is no route Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 12/36] media: entity: Add an iterator helper for connected pads Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 13/36] media: entity: Add only connected pads to the pipeline Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 14/36] media: entity: Add debug information in graph walk route check Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 15/36] media: Add bus type to frame descriptors Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 16/36] media: Add CSI-2 bus configuration " Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 17/36] media: Add stream to frame descriptor Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 18/36] media: subdev: increase V4L2_FRAME_DESC_ENTRY_MAX to 8 Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 19/36] media: add V4L2_SUBDEV_FL_MULTIPLEXED Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 20/36] media: add V4L2_SUBDEV_CAP_MPLEXED Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 21/36] media: Documentation: Add GS_ROUTING documentation Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 22/36] media: subdev: Add [GS]_ROUTING subdev ioctls and operations Tomi Valkeinen
2022-07-07 9:15 ` Tomasz Figa
2022-07-14 6:47 ` Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 23/36] media: subdev: add v4l2_subdev_has_route() Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 24/36] media: subdev: add v4l2_subdev_set_routing helper() Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 25/36] media: Documentation: add multiplexed streams documentation Tomi Valkeinen
2022-03-16 9:04 ` Jacopo Mondi
2022-03-17 7:18 ` Tomi Valkeinen
2022-03-17 8:27 ` Jacopo Mondi
2022-03-01 16:11 ` [PATCH v11 26/36] media: subdev: add stream based configuration Tomi Valkeinen
2022-03-16 9:59 ` Jacopo Mondi
2022-03-17 8:01 ` Tomi Valkeinen
2022-03-17 8:38 ` Jacopo Mondi
2022-03-17 8:48 ` Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 27/36] media: subdev: use streams in v4l2_subdev_link_validate() Tomi Valkeinen
2022-03-16 10:47 ` Jacopo Mondi
2022-03-17 8:39 ` Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 28/36] media: subdev: add "opposite" stream helper funcs Tomi Valkeinen
2022-03-16 10:50 ` Jacopo Mondi
2022-03-17 9:10 ` Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 29/36] media: subdev: add v4l2_subdev_get_fmt() helper function Tomi Valkeinen
2022-03-16 11:00 ` Jacopo Mondi
2022-03-01 16:11 ` [PATCH v11 30/36] media: subdev: Fallback to pad config in v4l2_subdev_get_fmt() Tomi Valkeinen
2022-03-16 11:03 ` Jacopo Mondi
2022-03-17 9:18 ` Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 31/36] media: subdev: add v4l2_subdev_set_routing_with_fmt() helper Tomi Valkeinen
2022-03-16 11:04 ` Jacopo Mondi
2022-03-01 16:11 ` [PATCH v11 32/36] media: subdev: add v4l2_subdev_routing_validate() helper Tomi Valkeinen
2022-03-16 11:10 ` Jacopo Mondi
2022-03-17 9:15 ` Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 33/36] media: subdev: Add for_each_active_route() macro Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 34/36] media: v4l2-subdev: Add v4l2_subdev_state_xlate_streams() helper Tomi Valkeinen
2022-03-16 11:26 ` Jacopo Mondi
2022-03-17 9:27 ` Tomi Valkeinen
2022-03-17 9:35 ` Tomi Valkeinen
2022-07-07 10:27 ` Tomasz Figa
2022-07-14 7:41 ` Tomi Valkeinen
2022-07-19 5:38 ` Tomasz Figa
2022-03-01 16:11 ` [PATCH v11 35/36] media: v4l2-subdev: Add subdev .(enable|disable)_streams() operations Tomi Valkeinen
2022-03-16 12:05 ` Jacopo Mondi
2022-03-17 9:43 ` Tomi Valkeinen
2022-03-01 16:11 ` [PATCH v11 36/36] media: v4l2-subdev: Add v4l2_subdev_s_stream_helper() function Tomi Valkeinen
2022-03-16 12:10 ` Jacopo Mondi
2022-03-17 9:45 ` Tomi Valkeinen
2022-07-07 10:38 ` [PATCH v11 00/36] v4l: routing and streams support Tomasz Figa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220301161156.1119557-11-tomi.valkeinen@ideasonboard.com \
--to=tomi.valkeinen@ideasonboard.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jacopo+renesas@jmondi.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=michal.simek@xilinx.com \
--cc=niklas.soderlund+renesas@ragnatech.se \
--cc=p.yadav@ti.com \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).