From: Jacopo Mondi <jacopo+renesas@jmondi.org>
To: sakari.ailus@linux.intel.com, laurent.pinchart@ideasonboard.com,
niklas.soderlund+renesas@ragnatech.se
Cc: Jacopo Mondi <jacopo+renesas@jmondi.org>,
luca@lucaceresoli.net, ian.arkver.dev@gmail.com,
linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org
Subject: [PATCH v4 13/31] media: entity: Add only connected pads to the pipeline
Date: Thu, 28 Mar 2019 21:05:50 +0100 [thread overview]
Message-ID: <20190328200608.9463-14-jacopo+renesas@jmondi.org> (raw)
In-Reply-To: <20190328200608.9463-1-jacopo+renesas@jmondi.org>
From: Sakari Ailus <sakari.ailus@linux.intel.com>
A single entity may contain multiple pipelines. Only add pads that were
connected to the pad through which the entity was reached to the pipeline.
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>
---
drivers/media/media-entity.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index 5f6744732ed9..290083c445eb 100644
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -465,7 +465,7 @@ __must_check int __media_pipeline_start(struct media_pad *pad,
DECLARE_BITMAP(active, MEDIA_ENTITY_MAX_PADS);
DECLARE_BITMAP(has_no_links, MEDIA_ENTITY_MAX_PADS);
- media_entity_for_each_pad(entity, iter) {
+ media_entity_for_each_routed_pad(pad, iter) {
if (iter->pipe && iter->pipe != pipe) {
pr_err("Pipe active for %s. Can't start for %s\n",
entity->name, iter->entity->name);
@@ -554,10 +554,9 @@ __must_check int __media_pipeline_start(struct media_pad *pad,
media_graph_walk_start(graph, pad_err);
while ((pad_err = media_graph_walk_next(graph))) {
- struct media_entity *entity = pad->entity;
struct media_pad *iter;
- media_entity_for_each_pad(entity, iter) {
+ media_entity_for_each_routed_pad(pad, iter) {
/* Sanity check for negative stream_count */
if (!WARN_ON_ONCE(iter->stream_count <= 0)) {
--iter->stream_count;
@@ -610,10 +609,9 @@ void __media_pipeline_stop(struct media_pad *pad)
media_graph_walk_start(graph, pad);
while ((pad = media_graph_walk_next(graph))) {
- struct media_entity *entity = pad->entity;
struct media_pad *iter;
- media_entity_for_each_pad(entity, iter) {
+ media_entity_for_each_routed_pad(pad, iter) {
/* Sanity check for negative stream_count */
if (!WARN_ON_ONCE(iter->stream_count <= 0)) {
iter->stream_count--;
--
2.21.0
next prev parent reply other threads:[~2019-03-28 20:06 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-28 20:05 [PATCH v4 00/31] v4l: add support for multiplexed streams Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 01/31] media: entity: Use pad as a starting point for graph walk Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 02/31] media: entity: Use pads instead of entities in the media graph walk stack Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 03/31] media: entity: Walk the graph based on pads Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 04/31] v4l: mc: Start walk from a specific pad in use count calculation Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 05/31] media: entity: Add iterator helper for entity pads Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 06/31] media: entity: Move the pipeline from entity to pads Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 07/31] media: entity: Use pad as the starting point for a pipeline Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 08/31] media: entity: Add has_route entity operation Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 09/31] media: entity: Add media_entity_has_route() function Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 10/31] media: entity: Use routing information during graph traversal Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 11/31] media: entity: Skip link validation for pads to which there is no route to Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 12/31] media: entity: Add an iterator helper for connected pads Jacopo Mondi
2019-03-28 20:05 ` Jacopo Mondi [this message]
2019-03-28 20:05 ` [PATCH v4 14/31] media: entity: Add debug information in graph walk route check Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 15/31] v4l: Add bus type to frame descriptors Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 16/31] v4l: Add CSI-2 bus configuration " Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 17/31] v4l: Add stream to frame descriptor Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 18/31] v4l: subdev: Add [GS]_ROUTING subdev ioctls and operations Jacopo Mondi
2019-04-01 12:35 ` Sakari Ailus
2019-03-28 20:05 ` [PATCH v4 19/31] media: Documentation: Add GS_ROUTING documentation Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 20/31] v4l: subdev: Take routing information into account in link validation Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 21/31] v4l: subdev: Improve link format validation debug messages Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 22/31] v4l: mc: Add an S_ROUTING helper function for power state changes Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 23/31] adv748x: csi2: add translation from pixelcode to CSI-2 datatype Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 24/31] adv748x: csi2: only allow formats on sink pads Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 25/31] adv748x: csi2: describe the multiplexed stream Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 26/31] adv748x: csi2: add internal routing configuration Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 27/31] adv748x: afe: add routing support Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 28/31] adv748x: afe: Implement has_route() Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 29/31] rcar-csi2: use frame description information to configure CSI-2 bus Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 30/31] rcar-csi2: expose the subdevice internal routing Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 31/31] media: rcar-csi2: Implement has_route() Jacopo Mondi
2019-03-29 1:17 ` [PATCH v4 00/31] v4l: add support for multiplexed streams Sakari Ailus
2019-03-29 8:32 ` Jacopo Mondi
2019-04-01 12:32 ` Sakari Ailus
2021-02-11 13:44 ` Tomi Valkeinen
2022-10-06 11:20 ` Sakari Ailus
2022-10-07 11:58 ` Tomi Valkeinen
2022-10-07 12:14 ` Laurent Pinchart
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=20190328200608.9463-14-jacopo+renesas@jmondi.org \
--to=jacopo+renesas@jmondi.org \
--cc=ian.arkver.dev@gmail.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=luca@lucaceresoli.net \
--cc=niklas.soderlund+renesas@ragnatech.se \
--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).