From patchwork Thu Aug 23 13:25:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 10573931 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8D75C139B for ; Thu, 23 Aug 2018 13:28:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C4342B737 for ; Thu, 23 Aug 2018 13:28:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 80FCB2BE23; Thu, 23 Aug 2018 13:28:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38FA62B737 for ; Thu, 23 Aug 2018 13:28:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730764AbeHWQ5y (ORCPT ); Thu, 23 Aug 2018 12:57:54 -0400 Received: from vsp-unauthed02.binero.net ([195.74.38.227]:12279 "EHLO vsp-unauthed02.binero.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730718AbeHWQ5y (ORCPT ); Thu, 23 Aug 2018 12:57:54 -0400 X-Halon-ID: 6101598a-a6d8-11e8-8edf-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [89.233.230.99]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id 6101598a-a6d8-11e8-8edf-005056917f90; Thu, 23 Aug 2018 15:28:10 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: Laurent Pinchart , Sakari Ailus , linux-media@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org Subject: [PATCH 13/30] media: entity: Add only connected pads to the pipeline Date: Thu, 23 Aug 2018 15:25:27 +0200 Message-Id: <20180823132544.521-14-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180823132544.521-1-niklas.soderlund+renesas@ragnatech.se> References: <20180823132544.521-1-niklas.soderlund+renesas@ragnatech.se> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sakari Ailus 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 --- drivers/media/media-entity.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c index 0395d58b2e233d88..c11cf684b336f87e 100644 --- a/drivers/media/media-entity.c +++ b/drivers/media/media-entity.c @@ -460,15 +460,13 @@ __must_check int __media_pipeline_start(struct media_pad *pad, while ((pad = media_graph_walk_next(graph))) { struct media_entity *entity = pad->entity; - unsigned int i; + struct media_pad *iter; bool skip_validation = pad->pipe; DECLARE_BITMAP(active, MEDIA_ENTITY_MAX_PADS); DECLARE_BITMAP(has_no_links, MEDIA_ENTITY_MAX_PADS); - for (i = 0; i < entity->num_pads; i++) { - struct media_pad *iter = &entity->pads[i]; - + media_entity_for_routed_pads(pad, iter) { if (iter->pipe && WARN_ON(iter->pipe != pipe)) ret = -EBUSY; else @@ -553,12 +551,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_err = pad_err->entity; - unsigned int i; - - for (i = 0; i < entity_err->num_pads; i++) { - struct media_pad *iter = &entity_err->pads[i]; + struct media_pad *iter; + media_entity_for_routed_pads(pad_err, iter) { /* Sanity check for negative stream_count */ if (!WARN_ON_ONCE(iter->stream_count <= 0)) { --iter->stream_count; @@ -611,12 +606,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; - unsigned int i; - - for (i = 0; i < entity->num_pads; i++) { - struct media_pad *iter = &entity->pads[i]; + struct media_pad *iter; + media_entity_for_routed_pads(pad, iter) { /* Sanity check for negative stream_count */ if (!WARN_ON_ONCE(iter->stream_count <= 0)) { iter->stream_count--;