From: Helen Koike <helen.koike@collabora.com>
To: linux-media@vger.kernel.org
Cc: mchehab@kernel.org, linux-kernel@vger.kernel.org,
tfiga@chromium.org, linux-rockchip@lists.infradead.org,
hans.verkuil@cisco.com, kernel@collabora.com,
Helen Koike <helen.koike@collabora.com>
Subject: [PATCH 2/3] media: staging: rkisp1: do not call s_stream if the entity is still in use
Date: Thu, 12 Mar 2020 22:46:25 -0300 [thread overview]
Message-ID: <20200313014626.3103091-3-helen.koike@collabora.com> (raw)
In-Reply-To: <20200313014626.3103091-1-helen.koike@collabora.com>
If stream is being used by another stream, then .s_stream callback
shouldn't be called.
This fixes the following behaviour:
When performing smultaneos stream from both capture devices, stopping one
streaming would make the other to stall, since it disables all the shared
entities from both pipelines.
Signed-off-by: Helen Koike <helen.koike@collabora.com>
---
Hi,
I'm not sure if it is ok to check for entity->pipe, since I didn't see
other drivers doing this.
Please let me know if you have any other suggestion to verity if the entity
is marked as streaming.
Thanks
---
drivers/staging/media/rkisp1/rkisp1-capture.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
index 97091e5a6e6c..e665381b5af0 100644
--- a/drivers/staging/media/rkisp1/rkisp1-capture.c
+++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
@@ -892,6 +892,10 @@ static int rkisp1_pipeline_disable_cb(struct media_entity *from,
{
struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(curr);
+ /* subdevice is already enabled */
+ if (curr->pipe)
+ return 0;
+
return v4l2_subdev_call(sd, video, s_stream, false);
}
@@ -900,6 +904,10 @@ static int rkisp1_pipeline_enable_cb(struct media_entity *from,
{
struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(curr);
+ /* don't disable subdevice if it is still in use by another stream */
+ if (curr->pipe)
+ return 0;
+
return v4l2_subdev_call(sd, video, s_stream, true);
}
--
2.25.0
next prev parent reply other threads:[~2020-03-13 1:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-13 1:46 [PATCH 0/3] media: staging: rkisp1: allow simultaneous streaming from multiple capture devices Helen Koike
2020-03-13 1:46 ` [PATCH 1/3] media: staging: rkisp1: cap: fix return values from pm functions Helen Koike
2020-03-13 1:46 ` Helen Koike [this message]
2020-03-13 1:46 ` [PATCH 3/3] media: staging: rkisp1: cap: serialize start/stop stream Helen Koike
2020-03-13 16:51 ` [PATCH 0/3] media: staging: rkisp1: allow simultaneous streaming from multiple capture devices 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=20200313014626.3103091-3-helen.koike@collabora.com \
--to=helen.koike@collabora.com \
--cc=hans.verkuil@cisco.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=tfiga@chromium.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).