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 8A0D0C433EF for ; Fri, 17 Jun 2022 11:42:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380502AbiFQLmE (ORCPT ); Fri, 17 Jun 2022 07:42:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234717AbiFQLmE (ORCPT ); Fri, 17 Jun 2022 07:42:04 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 268ED6CAB0 for ; Fri, 17 Jun 2022 04:42:03 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C106B61F2E for ; Fri, 17 Jun 2022 11:42:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 663F3C3411B; Fri, 17 Jun 2022 11:42:00 +0000 (UTC) Message-ID: <0bc99232-658b-5308-8004-7ae14e979370@xs4all.nl> Date: Fri, 17 Jun 2022 13:41:59 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Subject: Re: [PATCH 38/55] media: mc-entity: Add a new helper function to get a remote pad for a pad Content-Language: en-US To: Paul Elder , linux-media@vger.kernel.org Cc: Laurent Pinchart , dafna@fastmail.com, heiko@sntech.de, jeanmichel.hautbois@ideasonboard.com, jacopo@jmondi.org, djrscally@gmail.com, helen.koike@collabora.com, linux-rockchip@lists.infradead.org References: <20220614191127.3420492-1-paul.elder@ideasonboard.com> <20220614191127.3420492-39-paul.elder@ideasonboard.com> From: Hans Verkuil In-Reply-To: <20220614191127.3420492-39-paul.elder@ideasonboard.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On 6/14/22 21:11, Paul Elder wrote: > From: Laurent Pinchart > > The newly added media_entity_remote_source_pad() helper function handles > use cases where the entity has a link enabled uniqueness constraint > covering all pads. There are use cases where the constraint covers a > specific pad only. Add a new media_pad_remote_pad() function to handle > this. It operates as media_entity_remote_source_pad(), but on a given > pad instead of on the entity. > > Signed-off-by: Laurent Pinchart > --- > Documentation/driver-api/media/mc-core.rst | 4 +-- > drivers/media/mc/mc-entity.c | 31 ++++++++++++++++++++++ > include/media/media-entity.h | 18 +++++++++++++ > 3 files changed, 51 insertions(+), 2 deletions(-) > > diff --git a/Documentation/driver-api/media/mc-core.rst b/Documentation/driver-api/media/mc-core.rst > index a2d1e32e3abb..83c3bdbf67be 100644 > --- a/Documentation/driver-api/media/mc-core.rst > +++ b/Documentation/driver-api/media/mc-core.rst > @@ -186,8 +186,8 @@ is required and the graph structure can be freed normally. > > Helper functions can be used to find a link between two given pads, or a pad > connected to another pad through an enabled link > -(:c:func:`media_entity_find_link()`, :c:func:`media_entity_remote_pad()` and > -:c:func:`media_entity_remote_source_pad()`). > +(:c:func:`media_entity_find_link()`, :c:func:`media_entity_remote_pad()`, > +:c:func:`media_entity_remote_source_pad()` and :c:func:`media_pad_remote_pad()`). > > Use count and power handling > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c > index 1febf5a86be6..6429b0510bfb 100644 > --- a/drivers/media/mc/mc-entity.c > +++ b/drivers/media/mc/mc-entity.c > @@ -958,6 +958,37 @@ media_entity_remote_pad_unique(const struct media_entity *entity, > } > EXPORT_SYMBOL_GPL(media_entity_remote_pad_unique); > > +struct media_pad *media_pad_remote_pad(const struct media_pad *pad) > +{ > + struct media_pad *found_pad = NULL; > + struct media_link *link; > + > + list_for_each_entry(link, &pad->entity->links, list) { > + struct media_pad *remote_pad; > + > + if (!(link->flags & MEDIA_LNK_FL_ENABLED)) > + continue; > + > + if (link->sink == pad) > + remote_pad = link->source; > + else if (link->source == pad) > + remote_pad = link->sink; > + else > + continue; > + > + if (found_pad) > + return ERR_PTR(-ENOTUNIQ); > + > + found_pad = remote_pad; > + } > + > + if (!found_pad) > + return ERR_PTR(-ENOLINK); > + > + return found_pad; > +} > +EXPORT_SYMBOL_GPL(media_pad_remote_pad); > + > static void media_interface_init(struct media_device *mdev, > struct media_interface *intf, > u32 gobj_type, > diff --git a/include/media/media-entity.h b/include/media/media-entity.h > index 33d5f52719a0..bfe6a7b10a68 100644 > --- a/include/media/media-entity.h > +++ b/include/media/media-entity.h > @@ -904,6 +904,24 @@ media_entity_remote_source_pad(const struct media_entity *entity) > return media_entity_remote_pad_unique(entity, MEDIA_PAD_FL_SOURCE); > } > > +/** > + * media_pad_remote_pad - Find a remote pad connected to a pad Same question here: shouldn't this be called media_pad_remote_pad_unique? > + * @pad: The pad > + * > + * Search for and return a remote pad connected to @pad through an enabled > + * link. If multiple (or no) remote pads are found, an error is returned. > + * > + * The uniqueness constraint makes this helper function suitable for entities > + * that support a single active source at a time on a given pad. > + * > + * Return: A pointer to the remote pad, or one of the following error pointers > + * if an error occurs: > + * > + * * -ENOTUNIQ - Multiple links are enabled > + * * -ENOLINK - No connected pad found > + */ > +struct media_pad *media_pad_remote_pad(const struct media_pad *pad); > + > /** > * media_entity_is_streaming - Test if an entity is part of a streaming pipeline > * @entity: The entity With that change: Acked-by: Hans Verkuil Regards, Hans 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 28D59C43334 for ; Fri, 17 Jun 2022 11:42:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0cq/hEgzJdo/fyMCp8RwYfShefbVh7FqdwKCN/cDJlk=; b=s18O/pc9VBxhac XEb3SAjBFWDZmhIsc2e3QaguF5KE/7ec4RBHR6Q6KjEMI9Cm/VjRVslVtlMchX2+mt6NSJn8eZQMm KJmKL1ofLZ0jaBt9hs80mCGOgXWOeQVXalO0ngWr1k+ctArwXj31f/M2fuWP8fdRuwm9mtPPLCgEH X3e0SkkDzF0ludosqdkcX2dcWe6kMwgdZhL9m6/lOl3X1Q1uvtInEIYTGvy2YDpStV1L2/tgTIKNH It4j/62ygOWeZLGoaiOOa2hTeBZzTNASTwX5plTGrMa7NodKKYsvJk9WAFX8eS31uB/V5HW1fRw9h NXjsVYkc6u4M3c8kVqgg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o2AMe-007PGo-Vq; Fri, 17 Jun 2022 11:42:13 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o2AMW-007PE8-Ur for linux-rockchip@lists.infradead.org; Fri, 17 Jun 2022 11:42:11 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5A044B82854; Fri, 17 Jun 2022 11:42:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 663F3C3411B; Fri, 17 Jun 2022 11:42:00 +0000 (UTC) Message-ID: <0bc99232-658b-5308-8004-7ae14e979370@xs4all.nl> Date: Fri, 17 Jun 2022 13:41:59 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Subject: Re: [PATCH 38/55] media: mc-entity: Add a new helper function to get a remote pad for a pad Content-Language: en-US To: Paul Elder , linux-media@vger.kernel.org Cc: Laurent Pinchart , dafna@fastmail.com, heiko@sntech.de, jeanmichel.hautbois@ideasonboard.com, jacopo@jmondi.org, djrscally@gmail.com, helen.koike@collabora.com, linux-rockchip@lists.infradead.org References: <20220614191127.3420492-1-paul.elder@ideasonboard.com> <20220614191127.3420492-39-paul.elder@ideasonboard.com> From: Hans Verkuil In-Reply-To: <20220614191127.3420492-39-paul.elder@ideasonboard.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220617_044205_355996_92F09113 X-CRM114-Status: GOOD ( 27.42 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org On 6/14/22 21:11, Paul Elder wrote: > From: Laurent Pinchart > > The newly added media_entity_remote_source_pad() helper function handles > use cases where the entity has a link enabled uniqueness constraint > covering all pads. There are use cases where the constraint covers a > specific pad only. Add a new media_pad_remote_pad() function to handle > this. It operates as media_entity_remote_source_pad(), but on a given > pad instead of on the entity. > > Signed-off-by: Laurent Pinchart > --- > Documentation/driver-api/media/mc-core.rst | 4 +-- > drivers/media/mc/mc-entity.c | 31 ++++++++++++++++++++++ > include/media/media-entity.h | 18 +++++++++++++ > 3 files changed, 51 insertions(+), 2 deletions(-) > > diff --git a/Documentation/driver-api/media/mc-core.rst b/Documentation/driver-api/media/mc-core.rst > index a2d1e32e3abb..83c3bdbf67be 100644 > --- a/Documentation/driver-api/media/mc-core.rst > +++ b/Documentation/driver-api/media/mc-core.rst > @@ -186,8 +186,8 @@ is required and the graph structure can be freed normally. > > Helper functions can be used to find a link between two given pads, or a pad > connected to another pad through an enabled link > -(:c:func:`media_entity_find_link()`, :c:func:`media_entity_remote_pad()` and > -:c:func:`media_entity_remote_source_pad()`). > +(:c:func:`media_entity_find_link()`, :c:func:`media_entity_remote_pad()`, > +:c:func:`media_entity_remote_source_pad()` and :c:func:`media_pad_remote_pad()`). > > Use count and power handling > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c > index 1febf5a86be6..6429b0510bfb 100644 > --- a/drivers/media/mc/mc-entity.c > +++ b/drivers/media/mc/mc-entity.c > @@ -958,6 +958,37 @@ media_entity_remote_pad_unique(const struct media_entity *entity, > } > EXPORT_SYMBOL_GPL(media_entity_remote_pad_unique); > > +struct media_pad *media_pad_remote_pad(const struct media_pad *pad) > +{ > + struct media_pad *found_pad = NULL; > + struct media_link *link; > + > + list_for_each_entry(link, &pad->entity->links, list) { > + struct media_pad *remote_pad; > + > + if (!(link->flags & MEDIA_LNK_FL_ENABLED)) > + continue; > + > + if (link->sink == pad) > + remote_pad = link->source; > + else if (link->source == pad) > + remote_pad = link->sink; > + else > + continue; > + > + if (found_pad) > + return ERR_PTR(-ENOTUNIQ); > + > + found_pad = remote_pad; > + } > + > + if (!found_pad) > + return ERR_PTR(-ENOLINK); > + > + return found_pad; > +} > +EXPORT_SYMBOL_GPL(media_pad_remote_pad); > + > static void media_interface_init(struct media_device *mdev, > struct media_interface *intf, > u32 gobj_type, > diff --git a/include/media/media-entity.h b/include/media/media-entity.h > index 33d5f52719a0..bfe6a7b10a68 100644 > --- a/include/media/media-entity.h > +++ b/include/media/media-entity.h > @@ -904,6 +904,24 @@ media_entity_remote_source_pad(const struct media_entity *entity) > return media_entity_remote_pad_unique(entity, MEDIA_PAD_FL_SOURCE); > } > > +/** > + * media_pad_remote_pad - Find a remote pad connected to a pad Same question here: shouldn't this be called media_pad_remote_pad_unique? > + * @pad: The pad > + * > + * Search for and return a remote pad connected to @pad through an enabled > + * link. If multiple (or no) remote pads are found, an error is returned. > + * > + * The uniqueness constraint makes this helper function suitable for entities > + * that support a single active source at a time on a given pad. > + * > + * Return: A pointer to the remote pad, or one of the following error pointers > + * if an error occurs: > + * > + * * -ENOTUNIQ - Multiple links are enabled > + * * -ENOLINK - No connected pad found > + */ > +struct media_pad *media_pad_remote_pad(const struct media_pad *pad); > + > /** > * media_entity_is_streaming - Test if an entity is part of a streaming pipeline > * @entity: The entity With that change: Acked-by: Hans Verkuil Regards, Hans _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip