From patchwork Wed Apr 15 01:30:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Helen Koike X-Patchwork-Id: 11489587 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 519F6112C for ; Wed, 15 Apr 2020 01:31:09 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 2D72B20737 for ; Wed, 15 Apr 2020 01:31:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Y7JePLGI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2D72B20737 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JmXxG7/ORpE2i8Dtpbt77OnKNny+Uyh9rhn3Zdo8G7Y=; b=Y7JePLGIJI1HhK cipzxEVFUVWOB5wmpIZf/6wxodvOBKxoCsGSOxDpK7laFhZf6w4D9hiasaUMTw3QBQ/GXHOYx2DSV m6G+mhr+k1hwoV8jJjt53otv/fwF5HbWOc1YyMazqdTT2apBJTWdFMzZiZV09HXb3zEQtRCpGri2d vQRb6B+u7J3Q/dzsznCCDLAKBQmAMbeGEkHs6CdfBupth0ymYXjTyvNqYNmfEnrv4xZb4FAR6pgrr bfiBBe26DaMQ/a/4ZJCSsf/482U9JRDXqWg9TzsRvesIzw99ZvyH2sUJ8gZSzhCtlEqhuVFUtf0Sd Pq6Lv5erHNzelg1xW+UQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jOWtN-0004JD-Qi; Wed, 15 Apr 2020 01:31:05 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jOWtK-0004Gi-38 for linux-rockchip@lists.infradead.org; Wed, 15 Apr 2020 01:31:03 +0000 Received: from floko.floko.floko (unknown [IPv6:2804:431:e7cc:79a2:b6f7:4033:5775:cc3a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: koike) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id C18502A1C4B; Wed, 15 Apr 2020 02:30:57 +0100 (BST) From: Helen Koike To: linux-media@vger.kernel.org Subject: [PATCH v3 1/4] media: mc-entity.c: add media_graph_walk_next_stream() Date: Tue, 14 Apr 2020 22:30:41 -0300 Message-Id: <20200415013044.1778572-2-helen.koike@collabora.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200415013044.1778572-1-helen.koike@collabora.com> References: <20200415013044.1778572-1-helen.koike@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200414_183102_268371_F7C83600 X-CRM114-Status: GOOD ( 14.64 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [46.235.227.227 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mchehab@kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Helen Koike , hans.verkuil@cisco.com, skhan@linuxfoundation.org, niklas.soderlund@ragnatech.se, kernel@collabora.com Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Add media_graph_walk_next_stream() function to follow links only from sink to source (not the opposite) to allow iteration only through the entities participating in a given stream. This is useful to allow calling .s_stream() callback only in the subdevices that requires to be enabled/disabled, and avoid calling this callback when not required. Signed-off-by: Helen Koike Reviewed-by: Niklas Söderlund --- Changes in v3: - Patch re-added in the series from version 1 Changes in v2: None drivers/media/mc/mc-entity.c | 34 +++++++++++++++++++++++++++++++--- include/media/media-entity.h | 15 +++++++++++++++ 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c index 211279c5fd77d..0d44c2de23e6f 100644 --- a/drivers/media/mc/mc-entity.c +++ b/drivers/media/mc/mc-entity.c @@ -228,6 +228,11 @@ EXPORT_SYMBOL_GPL(media_entity_pads_init); * Graph traversal */ +enum media_graph_walk_type { + MEDIA_GRAPH_WALK_CONNECTED_NODES, + MEDIA_GRAPH_WALK_STREAM_NODES, +}; + static struct media_entity * media_entity_other(struct media_entity *entity, struct media_link *link) { @@ -305,7 +310,8 @@ void media_graph_walk_start(struct media_graph *graph, } EXPORT_SYMBOL_GPL(media_graph_walk_start); -static void media_graph_walk_iter(struct media_graph *graph) +static void media_graph_walk_iter(struct media_graph *graph, + enum media_graph_walk_type type) { struct media_entity *entity = stack_top(graph); struct media_link *link; @@ -326,6 +332,15 @@ static void media_graph_walk_iter(struct media_graph *graph) /* Get the entity in the other end of the link . */ next = media_entity_other(entity, link); + if (type == MEDIA_GRAPH_WALK_STREAM_NODES + && next == link->sink->entity) { + link_top(graph) = link_top(graph)->next; + dev_dbg(entity->graph_obj.mdev->dev, + "walk: skipping '%s' (outside of the stream path)\n", + link->sink->entity->name); + return; + } + /* Has the entity already been visited? */ if (media_entity_enum_test_and_set(&graph->ent_enum, next)) { link_top(graph) = link_top(graph)->next; @@ -342,7 +357,9 @@ static void media_graph_walk_iter(struct media_graph *graph) next->name); } -struct media_entity *media_graph_walk_next(struct media_graph *graph) +static struct media_entity * +__media_graph_walk_next(struct media_graph *graph, + enum media_graph_walk_type type) { struct media_entity *entity; @@ -355,7 +372,7 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph) * found. */ while (link_top(graph) != &stack_top(graph)->links) - media_graph_walk_iter(graph); + media_graph_walk_iter(graph, type); entity = stack_pop(graph); dev_dbg(entity->graph_obj.mdev->dev, @@ -363,8 +380,19 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph) return entity; } + +struct media_entity *media_graph_walk_next(struct media_graph *graph) +{ + return __media_graph_walk_next(graph, MEDIA_GRAPH_WALK_CONNECTED_NODES); +} EXPORT_SYMBOL_GPL(media_graph_walk_next); +struct media_entity *media_graph_walk_next_stream(struct media_graph *graph) +{ + return __media_graph_walk_next(graph, MEDIA_GRAPH_WALK_STREAM_NODES); +} +EXPORT_SYMBOL_GPL(media_graph_walk_next_stream); + int media_entity_get_fwnode_pad(struct media_entity *entity, struct fwnode_handle *fwnode, unsigned long direction_flags) diff --git a/include/media/media-entity.h b/include/media/media-entity.h index 8cb2c504a05c7..f17a5180ce524 100644 --- a/include/media/media-entity.h +++ b/include/media/media-entity.h @@ -927,6 +927,21 @@ void media_graph_walk_start(struct media_graph *graph, */ struct media_entity *media_graph_walk_next(struct media_graph *graph); +/** + * media_graph_walk_next_stream - Get the next entity in the graph + * @graph: Media graph structure + * + * Perform a depth-first traversal of the given media entities graph only + * following links from sink to source (and not the opposite). + * + * The graph structure must have been previously initialized with a call to + * media_graph_walk_start(). + * + * Return: returns the next entity in the graph in the stream path + * or %NULL if the whole stream path have been traversed. + */ +struct media_entity *media_graph_walk_next_stream(struct media_graph *graph); + /** * media_pipeline_start - Mark a pipeline as streaming * @entity: Starting entity From patchwork Wed Apr 15 01:30:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Koike X-Patchwork-Id: 11489591 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2A7E281 for ; Wed, 15 Apr 2020 01:31:13 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 076A720737 for ; Wed, 15 Apr 2020 01:31:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pzIOhwpU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 076A720737 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1dSlB8uzfeFIwNhUO/CbdOUaT5pBkCfG94n/tN2DrI4=; b=pzIOhwpUjyIa0G zwTXR6VBn6KKv4tPFB7xaUAkTj8IrdOTDO29Eo1BzVI/h0eQS3ncGGAUbfCz9W8S4tdSWGEVCwIcT F7p/IchA6SwTQlzs5A/f0enx6lY2EwMjtFP8UQYSiP6FPkExXT6DjFP5UwgRylrcWt893c2mQN9bE cCF4ViY2R9Ty3Kis2aSSvoW1RiU6aRXSjkwGpR+Jf1fxGqqXA3xpHvu4lCi4OD7IsFKyeKNk0QdD2 C54iu3acfX3m+PvCqw0puKFBzu+bFbBTXadKqJ/+3zSHr+s+E5b2o96iDxA+ScKj1TUSEneZFhMZD osrSgd5DyWr7k8Prk2Bw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jOWtP-0004Kj-Bx; Wed, 15 Apr 2020 01:31:07 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jOWtM-0004I3-GH for linux-rockchip@lists.infradead.org; Wed, 15 Apr 2020 01:31:06 +0000 Received: from floko.floko.floko (unknown [IPv6:2804:431:e7cc:79a2:b6f7:4033:5775:cc3a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: koike) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id D6CD42A1C63; Wed, 15 Apr 2020 02:31:00 +0100 (BST) From: Helen Koike To: linux-media@vger.kernel.org Subject: [PATCH v3 2/4] media: v4l2-common: add helper functions to call s_stream() callbacks Date: Tue, 14 Apr 2020 22:30:42 -0300 Message-Id: <20200415013044.1778572-3-helen.koike@collabora.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200415013044.1778572-1-helen.koike@collabora.com> References: <20200415013044.1778572-1-helen.koike@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200414_183104_807590_AEAF8868 X-CRM114-Status: GOOD ( 19.15 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [46.235.227.227 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mchehab@kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Helen Koike , hans.verkuil@cisco.com, skhan@linuxfoundation.org, niklas.soderlund@ragnatech.se, kernel@collabora.com Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Add v4l2_pipeline_stream_{enable,disable} helper functions to iterate through the subdevices in a given stream (i.e following links from sink to source) and call .s_stream() callback. Add stream_count on the subdevice object for simultaneous streaming from different video devices which shares subdevices. Prevent calling .s_stream(true) if it was already called previously by another stream. Prevent calling .s_stream(false) from one stream when there are still others active. If .s_stream(true) fails, call .s_stream(false) in the reverse order. Signed-off-by: Helen Koike --- Changes in v3: - re-write helpers to use media walkers as in v1, but with v4l2_pipeline_subdevs_get() to reverse the order we call s_stream(true) in subdevices. - rename size to max_size (and update docs) in v4l2_pipeline_subdevs_get() to reflect the meaning of the argument. - add if defined(CONFIG_MEDIA_CONTROLLER) around helpers Changes in v2: - re-write helpers to not use media walkers drivers/media/v4l2-core/v4l2-common.c | 125 ++++++++++++++++++++++++++ include/media/v4l2-common.h | 43 +++++++++ include/media/v4l2-subdev.h | 2 + 3 files changed, 170 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c index 9e8eb45a5b03c..2f991a1a57d7c 100644 --- a/drivers/media/v4l2-core/v4l2-common.c +++ b/drivers/media/v4l2-core/v4l2-common.c @@ -442,3 +442,128 @@ int v4l2_fill_pixfmt(struct v4l2_pix_format *pixfmt, u32 pixelformat, return 0; } EXPORT_SYMBOL_GPL(v4l2_fill_pixfmt); + +#if defined(CONFIG_MEDIA_CONTROLLER) + +/* + * v4l2_pipeline_subdevs_get - Assemble a list of subdevices in a pipeline + * @subdevs: the array to be filled. + * @max_size: max number of elements that can fit in subdevs array. + * + * Walk from a video node, following links from sink to source and fill the + * array with subdevices in the path. + * The walker performs a depth-first traversal, which means that, in a topology + * sd1->sd2->sd3->vdev, sd1 will be the first element placed in the array. + * + * Return the number of subdevices filled in the array. + */ +static int v4l2_pipeline_subdevs_get(struct video_device *vdev, + struct media_pipeline *pipe, + struct v4l2_subdev **subdevs, + unsigned int max_size) +{ + struct media_entity *entity = &vdev->entity; + struct media_device *mdev = entity->graph_obj.mdev; + int idx = 0; + int ret; + + mutex_lock(&mdev->graph_mutex); + + if (!pipe->streaming_count) { + ret = media_graph_walk_init(&pipe->graph, mdev); + if (ret) { + mutex_unlock(&mdev->graph_mutex); + return ret; + } + } + + media_graph_walk_start(&pipe->graph, entity); + + while ((entity = media_graph_walk_next_stream(&pipe->graph))) { + if (!is_media_entity_v4l2_subdev(entity)) + continue; + if (WARN_ON(idx >= max_size)) { + mutex_unlock(&mdev->graph_mutex); + return -EINVAL; + } + subdevs[idx++] = media_entity_to_v4l2_subdev(entity); + } + + if (!pipe->streaming_count) + media_graph_walk_cleanup(&pipe->graph); + + mutex_unlock(&mdev->graph_mutex); + + return idx; +} + +__must_check int v4l2_pipeline_stream_enable(struct video_device *vdev, + struct media_pipeline *pipe) +{ + struct media_device *mdev = vdev->entity.graph_obj.mdev; + struct v4l2_subdev *subdevs[MEDIA_ENTITY_ENUM_MAX_DEPTH]; + struct v4l2_subdev *sd; + int i, size, ret; + + size = v4l2_pipeline_subdevs_get(vdev, pipe, + subdevs, ARRAY_SIZE(subdevs)); + if (size <= 0) + return size; + + /* Call s_stream() in reverse order to enable sensors last */ + for (i = size - 1; i >= 0; i--) { + sd = subdevs[i]; + if (sd->stream_count++) + continue; + dev_dbg(mdev->dev, + "enabling stream for '%s'\n", sd->entity.name); + ret = v4l2_subdev_call(sd, video, s_stream, true); + if (ret && ret != -ENOIOCTLCMD) { + sd->stream_count = 0; + goto err_stream_disable; + } + } + + return 0; + +err_stream_disable: + for (i++; i < size; i++) { + sd = subdevs[i]; + if (--sd->stream_count) + continue; + dev_dbg(mdev->dev, + "disabling stream for '%s'\n", sd->entity.name); + v4l2_subdev_call(sd, video, s_stream, false); + }; + + return ret; +} +EXPORT_SYMBOL_GPL(v4l2_pipeline_stream_enable); + +void v4l2_pipeline_stream_disable(struct video_device *vdev, + struct media_pipeline *pipe) +{ + struct media_device *mdev = vdev->entity.graph_obj.mdev; + struct v4l2_subdev *subdevs[MEDIA_ENTITY_ENUM_MAX_DEPTH]; + unsigned int i; + int size; + + size = v4l2_pipeline_subdevs_get(vdev, pipe, + subdevs, ARRAY_SIZE(subdevs)); + if (WARN_ON(size < 0)) + return; + + /* Call s_stream() in order to disable sensors first */ + for (i = 0; i < size; i++) { + struct v4l2_subdev *sd = subdevs[i]; + + if (--sd->stream_count) + continue; + dev_dbg(mdev->dev, + "disabling stream for '%s'\n", sd->entity.name); + v4l2_subdev_call(sd, video, s_stream, false); + } +} +EXPORT_SYMBOL_GPL(v4l2_pipeline_stream_disable); + +#endif /* CONFIG_MEDIA_CONTROLLER */ diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h index 150ee16ebd811..dc46812120cdc 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h @@ -539,4 +539,47 @@ static inline void v4l2_buffer_set_timestamp(struct v4l2_buffer *buf, buf->timestamp.tv_usec = ts.tv_nsec / NSEC_PER_USEC; } +#if defined(CONFIG_MEDIA_CONTROLLER) + +/** + * v4l2_pipeline_stream_enable - Call .s_stream(true) callbacks in the stream + * @vdev: Starting video device. + * @pipe: Pipeline this entity belongs to. + * + * Call .s_stream(true) callback in all the subdevices participating in the + * stream, i.e. following links from sink to source. + * + * .s_stream(true) is also called from sink to source, i.e. in a topology + * sd1->sd2->sd3->vdev, .s_stream(true) of sd3 is called first. + * + * Calls to this function can be nested, in which case the same number of + * v4l2_pipeline_stream_disable() calls will be required to disable streaming + * through subdevices in the pipeline. + * The pipeline pointer must be identical for all nested calls to + * v4l2_pipeline_stream_enable(). + */ +__must_check int v4l2_pipeline_stream_enable(struct video_device *vdev, + struct media_pipeline *pipe); + +/** + * v4l2_pipeline_stream_disable - Call .s_stream(false) callbacks in the stream + * @vdev: Starting video device. + * @pipe: Pipeline this entity belongs to. + * + * Call .s_stream(false) callback in all the subdevices participating in the + * stream, i.e. following links from sink to source. + * + * s_stream(false) is called in a reverse order from + * v4l2_pipeline_stream_enable(), i.e. in a topology sd1->sd2->sd3->vdev, + * .s_stream(false) of sd1 is called first. + * + * If multiple calls to v4l2_pipeline_stream_enable() have been made, the same + * number of calls to this function are required to disable streaming through + * subdevices in the pipeline. + */ +void v4l2_pipeline_stream_disable(struct video_device *vdev, + struct media_pipeline *pipe); + +#endif /* CONFIG_MEDIA_CONTROLLER */ + #endif /* V4L2_COMMON_H_ */ diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index a4848de598521..20f913a9f70c5 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -838,6 +838,7 @@ struct v4l2_subdev_platform_data { * @subdev_notifier: A sub-device notifier implicitly registered for the sub- * device using v4l2_device_register_sensor_subdev(). * @pdata: common part of subdevice platform data + * @stream_count: Stream count for the subdevice. * * Each instance of a subdev driver should create this struct, either * stand-alone or embedded in a larger struct. @@ -869,6 +870,7 @@ struct v4l2_subdev { struct v4l2_async_notifier *notifier; struct v4l2_async_notifier *subdev_notifier; struct v4l2_subdev_platform_data *pdata; + unsigned int stream_count; }; From patchwork Wed Apr 15 01:30:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Helen Koike X-Patchwork-Id: 11489593 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B186914B4 for ; Wed, 15 Apr 2020 01:31:13 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9025C20737 for ; Wed, 15 Apr 2020 01:31:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Kp8XbXHp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9025C20737 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Z5zYHNEm2AS3wqre/r+68Um5vuy4/GY7BzhoQLIIdwY=; b=Kp8XbXHpOJl4yd S+MMe5uYOqG4SHuPSOHPnWe5IgRzJlMPPG7ccDb7kTtpjv6kViUZgOauMij/f3ETk4w1aDV5QM1zt R6bGCOU/8Bj46HiTiy4HkxPOw6cco0IEyLhaZeHRqpakQCyTq0oemwRrnBTHNbFWKWkJk/w8h5tJw lfLlOy0ISHH1AO2qZYcXIYxS/kif38vEZ7rwxpku5jQFoYeHFWz5RVBDGst9ITxIMBHBIxM5IYYx0 UTVimb/zirQGbAa8Lo43N1M9Qman3KmYX6W/OZBM9UIT6AeUXLMbm2UTTbh3c0IgDRNsvITt4girq fMIOXHqkBqABWZ/d/a7w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jOWtS-0004OF-Kv; Wed, 15 Apr 2020 01:31:10 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jOWtP-0004KR-J4 for linux-rockchip@lists.infradead.org; Wed, 15 Apr 2020 01:31:09 +0000 Received: from floko.floko.floko (unknown [IPv6:2804:431:e7cc:79a2:b6f7:4033:5775:cc3a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: koike) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id E81B52A1C5B; Wed, 15 Apr 2020 02:31:03 +0100 (BST) From: Helen Koike To: linux-media@vger.kernel.org Subject: [PATCH v3 3/4] media: staging: rkisp1: use v4l2_pipeline_stream_{enable, disable} helpers Date: Tue, 14 Apr 2020 22:30:43 -0300 Message-Id: <20200415013044.1778572-4-helen.koike@collabora.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200415013044.1778572-1-helen.koike@collabora.com> References: <20200415013044.1778572-1-helen.koike@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200414_183107_770802_C58C9021 X-CRM114-Status: GOOD ( 13.38 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [46.235.227.227 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mchehab@kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Helen Koike , hans.verkuil@cisco.com, skhan@linuxfoundation.org, niklas.soderlund@ragnatech.se, kernel@collabora.com Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Use v4l2_pipeline_stream_{enable,disable} to call .s_stream() subdevice callbacks through the pipeline. Tested by streaming on Scarlet Chromebook. Signed-off-by: Helen Koike Reviewed-by: Niklas Söderlund --- Changes in v3: - rebase on top of new helpers prototypes Changes in v2: - rebase on top of new helpers prototypes drivers/staging/media/rkisp1/rkisp1-capture.c | 76 +------------------ 1 file changed, 3 insertions(+), 73 deletions(-) diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c index 24fe6a7888aa4..a18f1668e3563 100644 --- a/drivers/staging/media/rkisp1/rkisp1-capture.c +++ b/drivers/staging/media/rkisp1/rkisp1-capture.c @@ -838,71 +838,6 @@ static void rkisp1_return_all_buffers(struct rkisp1_capture *cap, spin_unlock_irqrestore(&cap->buf.lock, flags); } -/* - * rkisp1_pipeline_sink_walk - Walk through the pipeline and call cb - * @from: entity at which to start pipeline walk - * @until: entity at which to stop pipeline walk - * - * Walk the entities chain starting at the pipeline video node and stop - * all subdevices in the chain. - * - * If the until argument isn't NULL, stop the pipeline walk when reaching the - * until entity. This is used to disable a partially started pipeline due to a - * subdev start error. - */ -static int rkisp1_pipeline_sink_walk(struct media_entity *from, - struct media_entity *until, - int (*cb)(struct media_entity *from, - struct media_entity *curr)) -{ - struct media_entity *entity = from; - struct media_pad *pad; - unsigned int i; - int ret; - - while (1) { - pad = NULL; - /* Find remote source pad */ - for (i = 0; i < entity->num_pads; i++) { - struct media_pad *spad = &entity->pads[i]; - - if (!(spad->flags & MEDIA_PAD_FL_SINK)) - continue; - pad = media_entity_remote_pad(spad); - if (pad && is_media_entity_v4l2_subdev(pad->entity)) - break; - } - if (!pad || !is_media_entity_v4l2_subdev(pad->entity)) - break; - - entity = pad->entity; - if (entity == until) - break; - - ret = cb(from, entity); - if (ret) - return ret; - } - - return 0; -} - -static int rkisp1_pipeline_disable_cb(struct media_entity *from, - struct media_entity *curr) -{ - struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(curr); - - return v4l2_subdev_call(sd, video, s_stream, false); -} - -static int rkisp1_pipeline_enable_cb(struct media_entity *from, - struct media_entity *curr) -{ - struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(curr); - - return v4l2_subdev_call(sd, video, s_stream, true); -} - static void rkisp1_stream_stop(struct rkisp1_capture *cap) { int ret; @@ -929,11 +864,7 @@ static void rkisp1_vb2_stop_streaming(struct vb2_queue *queue) rkisp1_stream_stop(cap); media_pipeline_stop(&node->vdev.entity); - ret = rkisp1_pipeline_sink_walk(&node->vdev.entity, NULL, - rkisp1_pipeline_disable_cb); - if (ret) - dev_err(rkisp1->dev, - "pipeline stream-off failed error:%d\n", ret); + v4l2_pipeline_stream_disable(&node->vdev, &cap->rkisp1->pipe); rkisp1_return_all_buffers(cap, VB2_BUF_STATE_ERROR); @@ -1005,8 +936,7 @@ rkisp1_vb2_start_streaming(struct vb2_queue *queue, unsigned int count) rkisp1_stream_start(cap); /* start sub-devices */ - ret = rkisp1_pipeline_sink_walk(entity, NULL, - rkisp1_pipeline_enable_cb); + ret = v4l2_pipeline_stream_enable(&cap->vnode.vdev, &cap->rkisp1->pipe); if (ret) goto err_stop_stream; @@ -1019,7 +949,7 @@ rkisp1_vb2_start_streaming(struct vb2_queue *queue, unsigned int count) return 0; err_pipe_disable: - rkisp1_pipeline_sink_walk(entity, NULL, rkisp1_pipeline_disable_cb); + v4l2_pipeline_stream_disable(&cap->vnode.vdev, &cap->rkisp1->pipe); err_stop_stream: rkisp1_stream_stop(cap); v4l2_pipeline_pm_put(entity); From patchwork Wed Apr 15 01:30:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Koike X-Patchwork-Id: 11489597 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DD800112C for ; Wed, 15 Apr 2020 01:31:18 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id BB48D20737 for ; Wed, 15 Apr 2020 01:31:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bVaAW6t1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB48D20737 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Xyfo+bRdm9y5UALeu0Go943EGS6n+4eMrfCfpBHI/t8=; b=bVaAW6t1uQjM7w w1nx1LBnVH7siJ+h0PDI3/zNSSPsUSkn6ndR9uZnNcB/vLpZzrrkv9lJ+M/Vyfl0Y4to73YhEz9Dp g1S/EU77+i9jjJ3wKwjqLbWxPMUMw0dwwNZjSw2Ap9GdcV7RJXsDHLAT/PMWeGpFpjHaRlykQyLIL 4Paz8ar8pECzgwcHuwXJrc85NQn/2CEMxoeF/9hD52oSAOdPCn6Jl6XBmN1W/SR+LvUZXLmd0x1dN btJtFkwWwZzP926d3CJgIpIGvA/b67D1rQKedhdWKKpXK48gzY8v3drqkivQDjrr9qGwn6sy51Q0H Cm51H3TedK42qy3fD0fw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jOWtX-0004SN-LR; Wed, 15 Apr 2020 01:31:15 +0000 Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jOWtV-0004Py-1j for linux-rockchip@lists.infradead.org; Wed, 15 Apr 2020 01:31:14 +0000 Received: from floko.floko.floko (unknown [IPv6:2804:431:e7cc:79a2:b6f7:4033:5775:cc3a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: koike) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 4329B2A1C4B; Wed, 15 Apr 2020 02:31:06 +0100 (BST) From: Helen Koike To: linux-media@vger.kernel.org Subject: [PATCH v3 4/4] media: vimc: use v4l2_pipeline_stream_{enable, disable} helpers Date: Tue, 14 Apr 2020 22:30:44 -0300 Message-Id: <20200415013044.1778572-5-helen.koike@collabora.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200415013044.1778572-1-helen.koike@collabora.com> References: <20200415013044.1778572-1-helen.koike@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200414_183113_364074_71F7E99C X-CRM114-Status: GOOD ( 15.65 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mchehab@kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Helen Koike , hans.verkuil@cisco.com, skhan@linuxfoundation.org, niklas.soderlund@ragnatech.se, kernel@collabora.com Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Use v4l2_pipeline_stream_{enable,disable} to call .s_stream() subdevice callbacks through the pipeline. Tested streaming works with: media-ctl -d /dev/media0 -V '"Sensor A":0[fmt:SBGGR8_1X8/640x480]' media-ctl -d /dev/media0 -V '"Debayer A":0[fmt:SBGGR8_1X8/640x480]' media-ctl -d /dev/media0 -V '"Sensor B":0[fmt:SBGGR8_1X8/640x480]' media-ctl -d /dev/media0 -V '"Debayer B":0[fmt:SBGGR8_1X8/640x480]' media-ctl -d /dev/media0 -V '"Scaler":0[fmt:RGB888_1X24/640x480]' media-ctl -d /dev/media0 -V '"Scaler":0[crop:(100,50)/400x150]' media-ctl -d /dev/media0 -V '"Scaler":1[fmt:RGB888_1X24/1920x1440]' v4l2-ctl -d /dev/video2 -v width=1200,height=450 v4l2-ctl -d /dev/video0 -v pixelformat=BA81 v4l2-ctl -d /dev/video1 -v pixelformat=BA81 v4l2-ctl --stream-mmap --stream-count=10 -d /dev/video2 --stream-to=/tmp/test.raw Signed-off-by: Helen Koike --- Changes in v3: - rebase on top of new helpers prototypes Changes in v2: - rebase on top of new helpers prototypes .../media/test_drivers/vimc/vimc-capture.c | 28 +++++++---- .../media/test_drivers/vimc/vimc-streamer.c | 49 ++----------------- 2 files changed, 23 insertions(+), 54 deletions(-) diff --git a/drivers/media/test_drivers/vimc/vimc-capture.c b/drivers/media/test_drivers/vimc/vimc-capture.c index 5315c201314c9..73707634010e9 100644 --- a/drivers/media/test_drivers/vimc/vimc-capture.c +++ b/drivers/media/test_drivers/vimc/vimc-capture.c @@ -233,21 +233,27 @@ static int vimc_cap_start_streaming(struct vb2_queue *vq, unsigned int count) vcap->sequence = 0; - /* Start the media pipeline */ ret = media_pipeline_start(entity, &vcap->stream.pipe); - if (ret) { - vimc_cap_return_all_buffers(vcap, VB2_BUF_STATE_QUEUED); - return ret; - } + if (ret) + goto err_return_all_buffers; + + ret = v4l2_pipeline_stream_enable(&vcap->vdev, &vcap->stream.pipe); + if (ret) + goto err_stop_media_pipe; ret = vimc_streamer_s_stream(&vcap->stream, &vcap->ved, 1); - if (ret) { - media_pipeline_stop(entity); - vimc_cap_return_all_buffers(vcap, VB2_BUF_STATE_QUEUED); - return ret; - } + if (ret) + goto err_stop_stream; return 0; + +err_stop_stream: + v4l2_pipeline_stream_disable(&vcap->vdev, &vcap->stream.pipe); +err_stop_media_pipe: + media_pipeline_stop(entity); +err_return_all_buffers: + vimc_cap_return_all_buffers(vcap, VB2_BUF_STATE_QUEUED); + return ret; } /* @@ -260,6 +266,8 @@ static void vimc_cap_stop_streaming(struct vb2_queue *vq) vimc_streamer_s_stream(&vcap->stream, &vcap->ved, 0); + v4l2_pipeline_stream_disable(&vcap->vdev, &vcap->stream.pipe); + /* Stop the media pipeline */ media_pipeline_stop(&vcap->vdev.entity); diff --git a/drivers/media/test_drivers/vimc/vimc-streamer.c b/drivers/media/test_drivers/vimc/vimc-streamer.c index 65feb3c596db5..c0085f4695c2f 100644 --- a/drivers/media/test_drivers/vimc/vimc-streamer.c +++ b/drivers/media/test_drivers/vimc/vimc-streamer.c @@ -36,33 +36,6 @@ static struct media_entity *vimc_get_source_entity(struct media_entity *ent) return NULL; } -/** - * vimc_streamer_pipeline_terminate - Disable stream in all ved in stream - * - * @stream: the pointer to the stream structure with the pipeline to be - * disabled. - * - * Calls s_stream to disable the stream in each entity of the pipeline - * - */ -static void vimc_streamer_pipeline_terminate(struct vimc_stream *stream) -{ - struct vimc_ent_device *ved; - struct v4l2_subdev *sd; - - while (stream->pipe_size) { - stream->pipe_size--; - ved = stream->ved_pipeline[stream->pipe_size]; - stream->ved_pipeline[stream->pipe_size] = NULL; - - if (!is_media_entity_v4l2_subdev(ved->ent)) - continue; - - sd = media_entity_to_v4l2_subdev(ved->ent); - v4l2_subdev_call(sd, video, s_stream, 0); - } -} - /** * vimc_streamer_pipeline_init - Initializes the stream structure * @@ -82,27 +55,15 @@ static int vimc_streamer_pipeline_init(struct vimc_stream *stream, struct media_entity *entity; struct video_device *vdev; struct v4l2_subdev *sd; - int ret = 0; stream->pipe_size = 0; while (stream->pipe_size < VIMC_STREAMER_PIPELINE_MAX_SIZE) { if (!ved) { - vimc_streamer_pipeline_terminate(stream); + stream->pipe_size = 0; return -EINVAL; } stream->ved_pipeline[stream->pipe_size++] = ved; - if (is_media_entity_v4l2_subdev(ved->ent)) { - sd = media_entity_to_v4l2_subdev(ved->ent); - ret = v4l2_subdev_call(sd, video, s_stream, 1); - if (ret && ret != -ENOIOCTLCMD) { - dev_err(ved->dev, "subdev_call error %s\n", - ved->ent->name); - vimc_streamer_pipeline_terminate(stream); - return ret; - } - } - entity = vimc_get_source_entity(ved->ent); /* Check if the end of the pipeline was reached */ if (!entity) { @@ -111,7 +72,7 @@ static int vimc_streamer_pipeline_init(struct vimc_stream *stream, dev_err(ved->dev, "first entity in the pipe '%s' is not a source\n", ved->ent->name); - vimc_streamer_pipeline_terminate(stream); + stream->pipe_size = 0; return -EPIPE; } return 0; @@ -129,7 +90,7 @@ static int vimc_streamer_pipeline_init(struct vimc_stream *stream, } } - vimc_streamer_pipeline_terminate(stream); + stream->pipe_size = 0; return -EINVAL; } @@ -210,7 +171,7 @@ int vimc_streamer_s_stream(struct vimc_stream *stream, if (IS_ERR(stream->kthread)) { ret = PTR_ERR(stream->kthread); dev_err(ved->dev, "kthread_run failed with %d\n", ret); - vimc_streamer_pipeline_terminate(stream); + stream->pipe_size = 0; stream->kthread = NULL; return ret; } @@ -231,7 +192,7 @@ int vimc_streamer_s_stream(struct vimc_stream *stream, stream->kthread = NULL; - vimc_streamer_pipeline_terminate(stream); + stream->pipe_size = 0; } return 0;