From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88EA3C4332F for ; Thu, 15 Dec 2022 12:51:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229561AbiLOMvR (ORCPT ); Thu, 15 Dec 2022 07:51:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229475AbiLOMvQ (ORCPT ); Thu, 15 Dec 2022 07:51:16 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 411EA286DA for ; Thu, 15 Dec 2022 04:51:15 -0800 (PST) Received: from pendragon.ideasonboard.com (213-243-189-158.bb.dnainternet.fi [213.243.189.158]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 7EEB6FB; Thu, 15 Dec 2022 13:51:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1671108673; bh=nd/E3kn9pgEIkADqTVDLHsWhAKsBiXX7AlTZkBugqyo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=TlelzcAH2l5Myatm/3GSTIq6OGtT9zFb2FUB+eOvqDjxVnSqZM8aT6zP9vdPGdxKD dS7I4jcnZGrTn7j7bQMIEoGhJvcuK4WwXhRtKOyyGS0NoD2e1oQb+5A39XbWFYoR48 E0YrwMzWhWO4hPG1UsP26TJPrqEkVnR8dg4JRN0w= Date: Thu, 15 Dec 2022 14:51:10 +0200 From: Laurent Pinchart To: Tomi Valkeinen Cc: linux-media@vger.kernel.org, Sakari Ailus , Michal Simek , Sylwester Nawrocki Subject: Re: [PATCH v1 2/5] media: mc: entity: Add entity iterator for media_pipeline Message-ID: References: <20221212141621.724-1-laurent.pinchart@ideasonboard.com> <20221212141621.724-3-laurent.pinchart@ideasonboard.com> <953f3132-e031-75fa-5be3-63bab2accdba@ideasonboard.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <953f3132-e031-75fa-5be3-63bab2accdba@ideasonboard.com> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Tomi, On Thu, Dec 15, 2022 at 02:48:43PM +0200, Tomi Valkeinen wrote: > On 12/12/2022 16:16, Laurent Pinchart wrote: > > Add a media_pipeline_for_each_entity() macro to iterate over entities in > > a pipeline. This should be used by driver as a replacement of the > > media_graph_walk API, as iterating over the media_pipeline uses the > > cached list of pads and is thus more efficient. > > > > Deprecate the media_graph_walk API to indicate it shouldn't be used in > > new drivers. > > > > Signed-off-by: Laurent Pinchart > > --- > > drivers/media/mc/mc-entity.c | 37 +++++++++++++++++++ > > include/media/media-entity.h | 69 ++++++++++++++++++++++++++++++++++++ > > 2 files changed, 106 insertions(+) > > > > diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c > > index 70df2050951c..f19bb98071b2 100644 > > --- a/drivers/media/mc/mc-entity.c > > +++ b/drivers/media/mc/mc-entity.c > > @@ -950,6 +950,43 @@ __media_pipeline_pad_iter_next(struct media_pipeline *pipe, > > } > > EXPORT_SYMBOL_GPL(__media_pipeline_pad_iter_next); > > > > +int media_pipeline_entity_iter_init(struct media_pipeline *pipe, > > + struct media_pipeline_entity_iter *iter) > > +{ > > + return media_entity_enum_init(&iter->ent_enum, pipe->mdev); > > +} > > +EXPORT_SYMBOL_GPL(media_pipeline_entity_iter_init); > > + > > +void media_pipeline_entity_iter_cleanup(struct media_pipeline_entity_iter *iter) > > +{ > > + media_entity_enum_cleanup(&iter->ent_enum); > > +} > > +EXPORT_SYMBOL_GPL(media_pipeline_entity_iter_cleanup); > > + > > +struct media_entity * > > +__media_pipeline_entity_iter_next(struct media_pipeline *pipe, > > + struct media_pipeline_entity_iter *iter, > > + struct media_entity *entity) > > +{ > > + if (!entity) > > + iter->cursor = pipe->pads.next; > > + > > + while (iter->cursor != &pipe->pads) { > > + struct media_pipeline_pad *ppad; > > + struct media_entity *entity; > > + > > + ppad = list_entry(iter->cursor, struct media_pipeline_pad, list); > > + entity = ppad->pad->entity; > > + iter->cursor = iter->cursor->next; > > + > > + if (media_entity_enum_test_and_set(&iter->ent_enum, entity)) > > + return entity; > > Shouldn't this be if (!media_entity...)? Doesn't > media_entity_enum_test_and_set return true if the entity has already > been seen, and thus we shouldn't return it? You're absolutely right. I'll fix that. I wonder how it escaped my tests. > > + } > > + > > + return NULL; > > +} > > +EXPORT_SYMBOL_GPL(__media_pipeline_entity_iter_next); > > + > > /* ----------------------------------------------------------------------------- > > * Links management > > */ > > diff --git a/include/media/media-entity.h b/include/media/media-entity.h > > index e881e483b550..1b820cb6fed1 100644 > > --- a/include/media/media-entity.h > > +++ b/include/media/media-entity.h > > @@ -139,6 +139,17 @@ struct media_pipeline_pad_iter { > > struct list_head *cursor; > > }; > > > > +/** > > + * struct media_pipeline_entity_iter - Iterator for media_pipeline_for_each_entity > > + * > > + * @ent_enum: The entity enumeration tracker > > + * @cursor: The current element > > + */ > > +struct media_pipeline_entity_iter { > > + struct media_entity_enum ent_enum; > > + struct list_head *cursor; > > +}; > > + > > Same question here as for the previous one: can this be in the mc-entity.c? I'm afraid not, for the same reason as in the previous patch. -- Regards, Laurent Pinchart