linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
	Hans Verkuil <hverkuil-cisco@xs4all.nl>,
	Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>,
	Pratyush Yadav <p.yadav@ti.com>,
	Lokesh Vutla <lokeshvutla@ti.com>
Subject: [PATCH v7 02/27] media: entity: Use pads instead of entities in the media graph walk stack
Date: Mon, 24 May 2021 13:43:43 +0300	[thread overview]
Message-ID: <20210524104408.599645-3-tomi.valkeinen@ideasonboard.com> (raw)
In-Reply-To: <20210524104408.599645-1-tomi.valkeinen@ideasonboard.com>

From: Sakari Ailus <sakari.ailus@linux.intel.com>

Change the media graph walk stack structure to use media pads instead of
using media entities. In addition to the entity, the pad contains the
information which pad in the entity are being dealt with.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
 drivers/media/mc/mc-entity.c | 55 ++++++++++++++++++------------------
 include/media/media-entity.h |  8 +++---
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c
index b18502b61396..0d58634b6fa8 100644
--- a/drivers/media/mc/mc-entity.c
+++ b/drivers/media/mc/mc-entity.c
@@ -228,40 +228,39 @@ EXPORT_SYMBOL_GPL(media_entity_pads_init);
  * Graph traversal
  */
 
-static struct media_entity *
-media_entity_other(struct media_entity *entity, struct media_link *link)
+static struct media_pad *
+media_pad_other(struct media_pad *pad, struct media_link *link)
 {
-	if (link->source->entity == entity)
-		return link->sink->entity;
+	if (link->source == pad)
+		return link->sink;
 	else
-		return link->source->entity;
+		return link->source;
 }
 
 /* push an entity to traversal stack */
-static void stack_push(struct media_graph *graph,
-		       struct media_entity *entity)
+static void stack_push(struct media_graph *graph, struct media_pad *pad)
 {
 	if (graph->top == MEDIA_ENTITY_ENUM_MAX_DEPTH - 1) {
 		WARN_ON(1);
 		return;
 	}
 	graph->top++;
-	graph->stack[graph->top].link = entity->links.next;
-	graph->stack[graph->top].entity = entity;
+	graph->stack[graph->top].link = pad->entity->links.next;
+	graph->stack[graph->top].pad = pad;
 }
 
-static struct media_entity *stack_pop(struct media_graph *graph)
+static struct media_pad *stack_pop(struct media_graph *graph)
 {
-	struct media_entity *entity;
+	struct media_pad *pad;
 
-	entity = graph->stack[graph->top].entity;
+	pad = graph->stack[graph->top].pad;
 	graph->top--;
 
-	return entity;
+	return pad;
 }
 
 #define link_top(en)	((en)->stack[(en)->top].link)
-#define stack_top(en)	((en)->stack[(en)->top].entity)
+#define stack_top(en)	((en)->stack[(en)->top].pad)
 
 /**
  * media_graph_walk_init - Allocate resources for graph walk
@@ -297,8 +296,8 @@ void media_graph_walk_start(struct media_graph *graph, struct media_pad *pad)
 	media_entity_enum_set(&graph->ent_enum, pad->entity);
 
 	graph->top = 0;
-	graph->stack[graph->top].entity = NULL;
-	stack_push(graph, pad->entity);
+	graph->stack[graph->top].pad = NULL;
+	stack_push(graph, pad);
 	dev_dbg(pad->graph_obj.mdev->dev,
 		"begin graph walk at '%s':%u\n", pad->entity->name, pad->index);
 }
@@ -306,16 +305,16 @@ EXPORT_SYMBOL_GPL(media_graph_walk_start);
 
 static void media_graph_walk_iter(struct media_graph *graph)
 {
-	struct media_entity *entity = stack_top(graph);
+	struct media_pad *pad = stack_top(graph);
 	struct media_link *link;
-	struct media_entity *next;
+	struct media_pad *next;
 
 	link = list_entry(link_top(graph), typeof(*link), list);
 
 	/* The link is not enabled so we do not follow. */
 	if (!(link->flags & MEDIA_LNK_FL_ENABLED)) {
 		link_top(graph) = link_top(graph)->next;
-		dev_dbg(entity->graph_obj.mdev->dev,
+		dev_dbg(pad->graph_obj.mdev->dev,
 			"walk: skipping disabled link '%s':%u -> '%s':%u\n",
 			link->source->entity->name, link->source->index,
 			link->sink->entity->name, link->sink->index);
@@ -323,23 +322,23 @@ static void media_graph_walk_iter(struct media_graph *graph)
 	}
 
 	/* Get the entity in the other end of the link . */
-	next = media_entity_other(entity, link);
+	next = media_pad_other(pad, link);
 
 	/* Has the entity already been visited? */
-	if (media_entity_enum_test_and_set(&graph->ent_enum, next)) {
+	if (media_entity_enum_test_and_set(&graph->ent_enum, next->entity)) {
 		link_top(graph) = link_top(graph)->next;
-		dev_dbg(entity->graph_obj.mdev->dev,
+		dev_dbg(pad->graph_obj.mdev->dev,
 			"walk: skipping entity '%s' (already seen)\n",
-			next->name);
+			next->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(entity->graph_obj.mdev->dev, "walk: pushing '%s' on stack\n",
-		next->name);
-	lockdep_assert_held(&entity->graph_obj.mdev->graph_mutex);
+	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);
 }
 
 struct media_entity *media_graph_walk_next(struct media_graph *graph)
@@ -354,10 +353,10 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph)
 	 * top of the stack until no more entities on the level can be
 	 * found.
 	 */
-	while (link_top(graph) != &stack_top(graph)->links)
+	while (link_top(graph) != &stack_top(graph)->entity->links)
 		media_graph_walk_iter(graph);
 
-	entity = stack_pop(graph);
+	entity = stack_pop(graph)->entity;
 	dev_dbg(entity->graph_obj.mdev->dev,
 		"walk: returning entity '%s'\n", entity->name);
 
diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index b9bfcf34eb0a..5b55d6179e13 100644
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -78,16 +78,16 @@ struct media_entity_enum {
  * struct media_graph - Media graph traversal state
  *
  * @stack:		Graph traversal stack; the stack contains information
- *			on the path the media entities to be walked and the
- *			links through which they were reached.
- * @stack.entity:	pointer to &struct media_entity at the graph.
+ *			on the media pads to be walked and the links through
+ *			which they were reached.
+ * @stack.pad:		pointer to &struct media_pad at the graph.
  * @stack.link:		pointer to &struct list_head.
  * @ent_enum:		Visited entities
  * @top:		The top of the stack
  */
 struct media_graph {
 	struct {
-		struct media_entity *entity;
+		struct media_pad *pad;
 		struct list_head *link;
 	} stack[MEDIA_ENTITY_ENUM_MAX_DEPTH];
 
-- 
2.25.1


  parent reply	other threads:[~2021-05-24 10:44 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-24 10:43 [PATCH v7 00/27] v4l: subdev internal routing and streams Tomi Valkeinen
2021-05-24 10:43 ` [PATCH v7 01/27] media: entity: Use pad as a starting point for graph walk Tomi Valkeinen
2021-07-08 10:45   ` Jacopo Mondi
2021-05-24 10:43 ` Tomi Valkeinen [this message]
2021-05-24 10:43 ` [PATCH v7 03/27] media: entity: Walk the graph based on pads Tomi Valkeinen
2021-07-08 10:48   ` Jacopo Mondi
2021-05-24 10:43 ` [PATCH v7 04/27] v4l: mc: Start walk from a specific pad in use count calculation Tomi Valkeinen
2021-05-24 10:43 ` [PATCH v7 05/27] media: entity: Add iterator helper for entity pads Tomi Valkeinen
2021-05-24 10:43 ` [PATCH v7 06/27] media: entity: Move the pipeline from entity to pads Tomi Valkeinen
2021-07-08 13:11   ` Jacopo Mondi
2021-07-16  6:19     ` Tomi Valkeinen
2021-05-24 10:43 ` [PATCH v7 07/27] media: entity: Use pad as the starting point for a pipeline Tomi Valkeinen
2021-07-08 12:36   ` Jacopo Mondi
2021-07-11 15:25     ` Sakari Ailus
2021-07-16  6:35     ` Tomi Valkeinen
2021-05-24 10:43 ` [PATCH v7 08/27] media: entity: Add has_route entity operation Tomi Valkeinen
2021-07-08 12:43   ` Jacopo Mondi
2021-07-11 15:26     ` Sakari Ailus
2021-07-12  7:42       ` Jacopo Mondi
2021-07-26 18:13         ` Sakari Ailus
2021-05-24 10:43 ` [PATCH v7 09/27] media: entity: Add media_entity_has_route() function Tomi Valkeinen
2021-05-24 10:43 ` [PATCH v7 10/27] media: entity: Use routing information during graph traversal Tomi Valkeinen
2021-05-24 10:43 ` [PATCH v7 11/27] media: entity: Skip link validation for pads to which there is no route Tomi Valkeinen
2021-05-24 10:43 ` [PATCH v7 12/27] media: entity: Add an iterator helper for connected pads Tomi Valkeinen
2021-05-24 10:43 ` [PATCH v7 13/27] media: entity: Add only connected pads to the pipeline Tomi Valkeinen
2021-05-24 10:43 ` [PATCH v7 14/27] media: entity: Add debug information in graph walk route check Tomi Valkeinen
2021-05-24 10:43 ` [PATCH v7 15/27] v4l: Add bus type to frame descriptors Tomi Valkeinen
2021-05-24 10:43 ` [PATCH v7 16/27] v4l: Add CSI-2 bus configuration " Tomi Valkeinen
2021-05-24 10:43 ` [PATCH v7 17/27] v4l: Add stream to frame descriptor Tomi Valkeinen
2021-05-24 10:43 ` [PATCH v7 18/27] media: Documentation: Add GS_ROUTING documentation Tomi Valkeinen
2021-05-24 10:44 ` [PATCH v7 19/27] v4l: subdev: Add [GS]_ROUTING subdev ioctls and operations Tomi Valkeinen
2021-05-24 10:44 ` [PATCH v7 20/27] v4l: subdev: add V4L2_SUBDEV_ROUTE_FL_SOURCE Tomi Valkeinen
2021-06-05 22:44   ` Laurent Pinchart
2021-06-05 22:46     ` Laurent Pinchart
2021-07-02  7:49       ` Tomi Valkeinen
2021-05-24 10:44 ` [PATCH v7 21/27] v4l: subdev: routing kernel helper functions Tomi Valkeinen
2021-06-05 23:29   ` Laurent Pinchart
2021-07-11 15:48     ` Sakari Ailus
2021-05-24 10:44 ` [PATCH v7 22/27] v4l: subdev: add stream based configuration Tomi Valkeinen
2021-06-05 23:42   ` Laurent Pinchart
2021-07-02  8:56     ` Tomi Valkeinen
2021-05-24 10:44 ` [PATCH v7 23/27] v4l: subdev: add 'stream' to subdev ioctls Tomi Valkeinen
2021-06-05 23:46   ` Laurent Pinchart
2021-05-24 10:44 ` [PATCH v7 24/27] v4l: subdev: use streams in v4l2_subdev_link_validate() Tomi Valkeinen
2021-05-28 11:34   ` Tomi Valkeinen
2021-06-05 23:59     ` Laurent Pinchart
2021-07-09 10:02       ` Tomi Valkeinen
2021-05-24 10:44 ` [PATCH v7 25/27] v4l: subdev: add routing & stream config to v4l2_subdev_state Tomi Valkeinen
2021-06-06  0:01   ` Laurent Pinchart
2021-07-02  8:34     ` Tomi Valkeinen
2021-05-24 10:44 ` [PATCH v7 26/27] v4l: subdev: add V4L2_SUBDEV_FL_MULTIPLEXED Tomi Valkeinen
2021-05-24 10:44 ` [PATCH v7 27/27] v4l: subdev: increase V4L2_FRAME_DESC_ENTRY_MAX to 8 Tomi Valkeinen
2021-05-26  8:25 ` [PATCH v7 00/27] v4l: subdev internal routing and streams Tomi Valkeinen
2021-06-06  0:06 ` Laurent Pinchart
2021-07-09 15:18   ` Jacopo Mondi
2021-07-09 18:26     ` Tomi Valkeinen
2021-07-10  8:42       ` Jacopo Mondi
2021-07-12  8:19         ` Tomi Valkeinen
2021-07-23 10:21           ` Jacopo Mondi
2021-07-26 10:49             ` Tomi Valkeinen

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=20210524104408.599645-3-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=lokeshvutla@ti.com \
    --cc=mchehab@kernel.org \
    --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).