Linux-Renesas-SoC Archive on lore.kernel.org
 help / color / Atom feed
From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>,
	"Benoit Parrot" <bparrot@ti.com>,
	linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH v2 03/30] media: entity: Walk the graph based on pads
Date: Tue, 22 Jan 2019 16:50:30 +0200
Message-ID: <20190122145030.m2vows5yxldlphrr@paasikivi.fi.intel.com> (raw)
In-Reply-To: <20190115232822.GB31088@pendragon.ideasonboard.com>

Hi Laurent,

On Wed, Jan 16, 2019 at 01:28:22AM +0200, Laurent Pinchart wrote:
> Hi Sakari,
> 
> On Wed, Jan 16, 2019 at 12:34:07AM +0200, Sakari Ailus wrote:
> > On Wed, Jan 16, 2019 at 12:21:36AM +0200, Laurent Pinchart wrote:
> > > On Fri, Nov 02, 2018 at 12:31:17AM +0100, Niklas Söderlund wrote:
> > >> From: Sakari Ailus <sakari.ailus@linux.intel.com>
> > >> 
> > >> Instead of iterating over graph entities during the walk, iterate the pads
> > >> through which the entity was first reached. This is required in order to
> > >> make the entity pipeline pad-based rather than entity based.
> > >> 
> > >> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > >> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> > >> ---
> > >>  Documentation/media/kapi/mc-core.rst          |  7 ++-
> > >>  drivers/media/media-entity.c                  | 46 ++++++++++--------
> > >>  drivers/media/platform/exynos4-is/media-dev.c | 20 ++++----
> > >>  drivers/media/platform/omap3isp/ispvideo.c    | 17 +++----
> > >>  drivers/media/platform/vsp1/vsp1_video.c      | 12 ++---
> > >>  drivers/media/platform/xilinx/xilinx-dma.c    | 12 ++---
> > >>  drivers/media/v4l2-core/v4l2-mc.c             | 25 +++++-----
> > >>  .../staging/media/davinci_vpfe/vpfe_video.c   | 47 ++++++++++---------
> > >>  drivers/staging/media/omap4iss/iss_video.c    | 34 +++++++-------
> > >>  include/media/media-entity.h                  |  7 +--
> > >>  10 files changed, 122 insertions(+), 105 deletions(-)
> > > 
> > > [snip]
> > > 
> > >> diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c
> > >> index 51d2a571c06db6a3..5813639c63b56a2c 100644
> > >> --- a/drivers/media/platform/exynos4-is/media-dev.c
> > >> +++ b/drivers/media/platform/exynos4-is/media-dev.c
> > >> @@ -1135,7 +1135,7 @@ static int __fimc_md_modify_pipeline(struct media_entity *entity, bool enable)
> > >>  static int __fimc_md_modify_pipelines(struct media_entity *entity, bool enable,
> > >>  				      struct media_graph *graph)
> > >>  {
> > >> -	struct media_entity *entity_err = entity;
> > >> +	struct media_pad *pad, *pad_err = entity->pads;
> > >>  	int ret;
> > >>  
> > >>  	/*
> > >> @@ -1144,13 +1144,13 @@ static int __fimc_md_modify_pipelines(struct media_entity *entity, bool enable,
> > >>  	 * through active links. This is needed as we cannot power on/off the
> > >>  	 * subdevs in random order.
> > >>  	 */
> > >> -	media_graph_walk_start(graph, entity->pads);
> > >> +	media_graph_walk_start(graph, pad_err);
> > > 
> > > I would keep entity->pads here as we're not dealing with an error path.
> > > 
> > >>  
> > >> -	while ((entity = media_graph_walk_next(graph))) {
> > >> -		if (!is_media_entity_v4l2_video_device(entity))
> > >> +	while ((pad = media_graph_walk_next(graph))) {
> > >> +		if (!is_media_entity_v4l2_video_device(pad->entity))
> > >>  			continue;
> > >>  
> > >> -		ret  = __fimc_md_modify_pipeline(entity, enable);
> > >> +		ret  = __fimc_md_modify_pipeline(pad->entity, enable);
> > >>  
> > >>  		if (ret < 0)
> > >>  			goto err;
> > >> @@ -1159,15 +1159,15 @@ static int __fimc_md_modify_pipelines(struct media_entity *entity, bool enable,
> > >>  	return 0;
> > >>  
> > >>  err:
> > >> -	media_graph_walk_start(graph, entity_err->pads);
> > >> +	media_graph_walk_start(graph, pad_err);
> > >>  
> > >> -	while ((entity_err = media_graph_walk_next(graph))) {
> > >> -		if (!is_media_entity_v4l2_video_device(entity_err))
> > >> +	while ((pad_err = media_graph_walk_next(graph))) {
> > >> +		if (!is_media_entity_v4l2_video_device(pad_err->entity))
> > >>  			continue;
> > >>  
> > >> -		__fimc_md_modify_pipeline(entity_err, !enable);
> > >> +		__fimc_md_modify_pipeline(pad_err->entity, !enable);
> > >>  
> > >> -		if (entity_err == entity)
> > >> +		if (pad_err == pad)
> > >>  			break;
> > >>  	}
> > >>  
> > > 
> > > [snip]
> > > 
> > >> diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c
> > >> index 9ed480fe5b6e4762..98edd47b2f0ae747 100644
> > >> --- a/drivers/media/v4l2-core/v4l2-mc.c
> > >> +++ b/drivers/media/v4l2-core/v4l2-mc.c
> > >> @@ -339,13 +339,14 @@ EXPORT_SYMBOL_GPL(v4l_vb2q_enable_media_source);
> > >>  static int pipeline_pm_use_count(struct media_entity *entity,
> > >>  	struct media_graph *graph)
> > >>  {
> > >> +	struct media_pad *pad;
> > >>  	int use = 0;
> > >>  
> > >>  	media_graph_walk_start(graph, entity->pads);
> > >>  
> > >> -	while ((entity = media_graph_walk_next(graph))) {
> > >> -		if (is_media_entity_v4l2_video_device(entity))
> > >> -			use += entity->use_count;
> > >> +	while ((pad = media_graph_walk_next(graph))) {
> > >> +		if (is_media_entity_v4l2_video_device(pad->entity))
> > >> +			use += pad->entity->use_count;
> > >>  	}
> > >>  
> > >>  	return use;
> > >> @@ -398,7 +399,7 @@ static int pipeline_pm_power_one(struct media_entity *entity, int change)
> > >>  static int pipeline_pm_power(struct media_entity *entity, int change,
> > >>  	struct media_graph *graph)
> > >>  {
> > >> -	struct media_entity *first = entity;
> > >> +	struct media_pad *tmp_pad, *pad;
> > > 
> > > How about pad_err instead of tmp_pad, like in the exynos driver ? Or
> > > possible first_pad to retain the "first" name ?
> > 
> > Why? This is just a pad. It's an iterator. first_pad or pad_err are
> > misleading as such. If you don't like tmp_pad, how about "pad2"? The "pad"
> > variable is still used for a similar purpose.
> 
> The variable is a pad iterator used in the error path, which can't use
> the pad pointer as we need to stop iterating when we reach it. first_pad
> is a bad idea, but pad_err would convey the meaning.

I'm sure it'd convey a meaning but it's not the right meaning: this is an
iterator, not where the error happened. It'd require a code change as well
to change the meaning.

I'm not opposed to that necessarily, but I think it's more simple to grasp
as-is (with rename to e.g. pad2).

> 
> > > 
> > >>  	int ret = 0;
> > >>  
> > >>  	if (!change)
> > >> @@ -406,19 +407,19 @@ static int pipeline_pm_power(struct media_entity *entity, int change,
> > >>  
> > >>  	media_graph_walk_start(graph, entity->pads);
> > >>  
> > >> -	while (!ret && (entity = media_graph_walk_next(graph)))
> > >> -		if (is_media_entity_v4l2_subdev(entity))
> > >> -			ret = pipeline_pm_power_one(entity, change);
> > >> +	while (!ret && (pad = media_graph_walk_next(graph)))
> > >> +		if (is_media_entity_v4l2_subdev(pad->entity))
> > >> +			ret = pipeline_pm_power_one(pad->entity, change);
> > >>  
> > >>  	if (!ret)
> > >>  		return ret;
> > >>  
> > >> -	media_graph_walk_start(graph, first->pads);
> > >> +	media_graph_walk_start(graph, entity->pads);
> > >>  
> > >> -	while ((first = media_graph_walk_next(graph))
> > >> -	       && first != entity)
> > >> -		if (is_media_entity_v4l2_subdev(first))
> > >> -			pipeline_pm_power_one(first, -change);
> > >> +	while ((tmp_pad = media_graph_walk_next(graph))
> > >> +	       && tmp_pad != pad)
> > >> +		if (is_media_entity_v4l2_subdev(tmp_pad->entity))
> > >> +			pipeline_pm_power_one(tmp_pad->entity, -change);
> > >>  
> > >>  	return ret;
> > >>  }
> > > 
> > > [snip]
> > > 
> > >> diff --git a/include/media/media-entity.h b/include/media/media-entity.h
> > >> index 99c7606f01317741..cde6350d752bb0ae 100644
> > >> --- a/include/media/media-entity.h
> > >> +++ b/include/media/media-entity.h
> > >> @@ -952,10 +952,11 @@ void media_graph_walk_start(struct media_graph *graph, struct media_pad *pad);
> > >>   * The graph structure must have been previously initialized with a call to
> > >>   * media_graph_walk_start().
> > >>   *
> > >> - * Return: returns the next entity in the graph or %NULL if the whole graph
> > >> - * have been traversed.
> > >> + * Return: returns the next pad in the graph or %NULL if the whole
> > >> + * graph have been traversed. The pad which is returned is the pad
> > > 
> > > s/have been/has/been/
> > > s/The pad which is returned/The returned pad/
> > > 
> > >> + * through which a new entity is reached when parsing the graph.
> > > 
> > > through which the entity was reached when walking the graph.
> > 
> > I'd keep "new", as the intent is to underline that it's a new entity not
> > yet reached while walking the graph.
> 
> "through which the new entity was reached when walking the graph" then ?

Yes, please!

> 
> > > 
> > > With these addressed,
> > > 
> > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > 
> > >>   */
> > >> -struct media_entity *media_graph_walk_next(struct media_graph *graph);
> > >> +struct media_pad *media_graph_walk_next(struct media_graph *graph);
> > >>  
> > >>  /**
> > >>   * media_pipeline_start - Mark a pipeline as streaming
> 
> -- 
> Regards,
> 
> Laurent Pinchart

-- 
Sakari Ailus
sakari.ailus@linux.intel.com

  reply index

Thread overview: 90+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-01 23:31 [PATCH v2 00/30] v4l: add support for multiplexed streams Niklas Söderlund
2018-11-01 23:31 ` [PATCH v2 01/30] media: entity: Use pad as a starting point for graph walk Niklas Söderlund
2019-01-15 21:43   ` Laurent Pinchart
2018-11-01 23:31 ` [PATCH v2 02/30] media: entity: Use pads instead of entities in the media graph walk stack Niklas Söderlund
2019-01-15 22:03   ` Laurent Pinchart
2019-01-15 22:13     ` Sakari Ailus
2019-01-15 22:07   ` Laurent Pinchart
2018-11-01 23:31 ` [PATCH v2 03/30] media: entity: Walk the graph based on pads Niklas Söderlund
2019-01-15 22:21   ` Laurent Pinchart
     [not found]     ` <20190115223406.mxgzl36cp54gb7nv@kekkonen.localdomain>
2019-01-15 23:28       ` Laurent Pinchart
2019-01-22 14:50         ` Sakari Ailus [this message]
2019-02-14 15:15   ` Jacopo Mondi
2018-11-01 23:31 ` [PATCH v2 04/30] v4l: mc: Start walk from a specific pad in use count calculation Niklas Söderlund
2019-01-15 22:24   ` Laurent Pinchart
2019-01-15 22:36     ` Sakari Ailus
2018-11-01 23:31 ` [PATCH v2 05/30] media: entity: Move the pipeline from entity to pads Niklas Söderlund
2019-01-15 22:38   ` Laurent Pinchart
2019-01-15 22:48     ` Sakari Ailus
2019-02-14 15:53   ` Jacopo Mondi
2018-11-01 23:31 ` [PATCH v2 06/30] media: entity: Use pad as the starting point for a pipeline Niklas Söderlund
2019-01-15 22:54   ` Laurent Pinchart
2019-01-22 15:31     ` Sakari Ailus
2019-01-22 15:37       ` Laurent Pinchart
2019-01-22 16:16         ` Sakari Ailus
2018-11-01 23:31 ` [PATCH v2 07/30] media: entity: Add has_route entity operation Niklas Söderlund
2018-11-01 23:31 ` [PATCH v2 08/30] media: entity: Add media_has_route() function Niklas Söderlund
2018-11-01 23:31 ` [PATCH v2 09/30] media: entity: Swap pads if route is checked from source to sink Niklas Söderlund
2019-01-15 22:57   ` Laurent Pinchart
2019-01-22 15:15     ` Sakari Ailus
2019-01-22 15:20       ` Laurent Pinchart
2019-02-18  9:21         ` Jacopo Mondi
2019-02-22 12:18           ` Laurent Pinchart
2019-03-04 12:35             ` Jacopo Mondi
2019-03-05 20:04               ` Laurent Pinchart
2019-03-06  8:29                 ` Jacopo Mondi
2018-11-01 23:31 ` [PATCH v2 10/30] media: entity: Use routing information during graph traversal Niklas Söderlund
2018-11-01 23:31 ` [PATCH v2 11/30] media: entity: Skip link validation for pads to which there is no route to Niklas Söderlund
2019-01-15 23:13   ` Laurent Pinchart
2018-11-01 23:31 ` [PATCH v2 12/30] media: entity: Add an iterator helper for connected pads Niklas Söderlund
2019-01-15 23:24   ` Laurent Pinchart
2019-01-22 15:36     ` Sakari Ailus
2019-01-22 15:38       ` Laurent Pinchart
2019-01-22 16:21         ` Sakari Ailus
2018-11-01 23:31 ` [PATCH v2 13/30] media: entity: Add only connected pads to the pipeline Niklas Söderlund
2019-01-15 23:33   ` Laurent Pinchart
2018-11-01 23:31 ` [PATCH v2 14/30] media: entity: Add debug information in graph walk route check Niklas Söderlund
2019-01-15 23:35   ` Laurent Pinchart
2019-01-22 15:38     ` Sakari Ailus
2018-11-01 23:31 ` [PATCH v2 15/30] media: entity: Look for indirect routes Niklas Söderlund
2019-01-15 23:41   ` Laurent Pinchart
2019-01-22 15:56     ` Sakari Ailus
2018-11-01 23:31 ` [PATCH v2 16/30] v4l: subdev: Add [GS]_ROUTING subdev ioctls and operations Niklas Söderlund
2019-01-15 23:51   ` Laurent Pinchart
2019-01-22 16:14     ` Sakari Ailus
2019-01-22 17:00       ` Laurent Pinchart
2019-02-21 14:59     ` Jacopo Mondi
2019-02-21 23:49       ` Sakari Ailus
2019-02-22  8:46         ` Jacopo Mondi
2019-02-21 14:39   ` Jacopo Mondi
2019-02-21 22:31     ` Sakari Ailus
2019-02-22  8:40       ` Jacopo Mondi
2019-02-22 11:04         ` Sakari Ailus
2019-02-22 11:17           ` Jacopo Mondi
2019-02-22 11:29             ` Sakari Ailus
2019-02-22 13:37               ` Ian Arkver
2019-02-22 13:50               ` Geert Uytterhoeven
2018-11-01 23:31 ` [PATCH v2 17/30] v4l: subdev: compat: Implement handling for VIDIOC_SUBDEV_[GS]_ROUTING Niklas Söderlund
2019-01-08 10:04   ` Geert Uytterhoeven
2019-01-15 23:53   ` Laurent Pinchart
2019-01-22 15:57     ` Sakari Ailus
2019-02-18 11:21     ` Jacopo Mondi
2019-02-21 23:50       ` Sakari Ailus
2018-11-01 23:31 ` [PATCH v2 18/30] v4l: subdev: Take routing information into account in link validation Niklas Söderlund
2018-11-01 23:31 ` [PATCH v2 19/30] v4l: subdev: Improve link format validation debug messages Niklas Söderlund
2018-11-01 23:31 ` [PATCH v2 20/30] v4l: mc: Add an S_ROUTING helper function for power state changes Niklas Söderlund
2018-11-01 23:31 ` [PATCH v2 21/30] v4l: Add bus type to frame descriptors Niklas Söderlund
2018-11-01 23:31 ` [PATCH v2 22/30] v4l: Add CSI-2 bus configuration " Niklas Söderlund
2018-11-01 23:31 ` [PATCH v2 23/30] v4l: Add stream to frame descriptor Niklas Söderlund
2018-11-01 23:31 ` [PATCH v2 24/30] adv748x: csi2: add translation from pixelcode to CSI-2 datatype Niklas Söderlund
2018-11-01 23:31 ` [PATCH v2 25/30] adv748x: csi2: only allow formats on sink pads Niklas Söderlund
2019-02-21 14:18   ` Jacopo Mondi
2018-11-01 23:31 ` [PATCH v2 26/30] adv748x: csi2: describe the multiplexed stream Niklas Söderlund
2018-11-01 23:31 ` [PATCH v2 27/30] adv748x: csi2: add internal routing configuration Niklas Söderlund
2018-11-01 23:31 ` [PATCH v2 28/30] adv748x: afe: add routing support Niklas Söderlund
2018-11-01 23:31 ` [PATCH v2 29/30] rcar-csi2: use frame description information to configure CSI-2 bus Niklas Söderlund
2018-11-01 23:31 ` [PATCH v2 30/30] rcar-csi2: expose the subdevice internal routing Niklas Söderlund
2018-11-14 13:10   ` Nikita Yushchenko
2018-11-14 19:45     ` Niklas Söderlund
2018-12-03 22:16 ` [PATCH v2 00/30] v4l: add support for multiplexed streams Sakari Ailus
2018-12-05 22:09   ` Niklas Söderlund

Reply instructions:

You may reply publically 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=20190122145030.m2vows5yxldlphrr@paasikivi.fi.intel.com \
    --to=sakari.ailus@linux.intel.com \
    --cc=bparrot@ti.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=niklas.soderlund+renesas@ragnatech.se \
    /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

Linux-Renesas-SoC Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-renesas-soc/0 linux-renesas-soc/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-renesas-soc linux-renesas-soc/ https://lore.kernel.org/linux-renesas-soc \
		linux-renesas-soc@vger.kernel.org linux-renesas-soc@archiver.kernel.org
	public-inbox-index linux-renesas-soc


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-renesas-soc


AGPL code for this site: git clone https://public-inbox.org/ public-inbox