From: "Niklas Söderlund" <niklas.soderlund@ragnatech.se>
To: Helen Koike <helen.koike@collabora.com>
Cc: linux-media@vger.kernel.org, kernel@collabora.com,
linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org,
hans.verkuil@cisco.com, skhan@linuxfoundation.org,
mchehab@kernel.org
Subject: Re: [PATCH v3 3/4] media: staging: rkisp1: use v4l2_pipeline_stream_{enable,disable} helpers
Date: Fri, 24 Apr 2020 15:42:34 +0200 [thread overview]
Message-ID: <20200424134234.GC4040416@oden.dyn.berto.se> (raw)
In-Reply-To: <20200415013044.1778572-4-helen.koike@collabora.com>
Hi Helen,
Thanks for your work.
On 2020-04-14 22:30:43 -0300, Helen Koike wrote:
> 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 <helen.koike@collabora.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
>
> ---
>
> 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);
> --
> 2.26.0
>
--
Regards,
Niklas Söderlund
next prev parent reply other threads:[~2020-04-24 13:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-15 1:30 [PATCH v3 0/4] media: add v4l2_pipeline_stream_{enable,disable} helpers Helen Koike
2020-04-15 1:30 ` [PATCH v3 1/4] media: mc-entity.c: add media_graph_walk_next_stream() Helen Koike
2020-04-24 13:46 ` Niklas Söderlund
2020-04-15 1:30 ` [PATCH v3 2/4] media: v4l2-common: add helper functions to call s_stream() callbacks Helen Koike
2020-04-24 13:41 ` Niklas Söderlund
2020-04-27 13:49 ` Helen Koike
2020-05-21 12:03 ` Dafna Hirschfeld
2020-05-21 12:53 ` Helen Koike
2020-04-15 1:30 ` [PATCH v3 3/4] media: staging: rkisp1: use v4l2_pipeline_stream_{enable,disable} helpers Helen Koike
2020-04-24 13:42 ` Niklas Söderlund [this message]
2020-04-15 1:30 ` [PATCH v3 4/4] media: vimc: " Helen Koike
Reply instructions:
You may reply publicly 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=20200424134234.GC4040416@oden.dyn.berto.se \
--to=niklas.soderlund@ragnatech.se \
--cc=hans.verkuil@cisco.com \
--cc=helen.koike@collabora.com \
--cc=kernel@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mchehab@kernel.org \
--cc=skhan@linuxfoundation.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).