diff options
| author | Helen Koike <helen.koike@collabora.com> | 2020-11-07 02:02:36 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-11-17 08:59:13 +0300 |
| commit | 9d28a76d406b118df484ef3fd160c02c6cd1d6e7 (patch) | |
| tree | 95622a8f213cd11f369313bee0c52d954220cb80 | |
| parent | 167faadfcf9339088910e9e85a1b711fcbbef8e9 (diff) | |
| download | linux-9d28a76d406b118df484ef3fd160c02c6cd1d6e7.tar.xz | |
media: staging: rkisp1: cap: fix timeout when stopping the stream
The dma engine should be stopped first.
The driver waits for an interrupt to stop the stream in a known state
after a frame.
If rkisp1_cap_stream_disable() is called after stopping the rest of the
pipeline, then most likely the interrupt won't arrive, we'll get a
timeout and debugfs variables mp_stop_timeout or sp_stop_timeout will
be incremented.
Fixes: 37db540bb9d1f ("media: staging: rkisp1: cap: refactor enable/disable stream to allow multistreaming")
Signed-off-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
| -rw-r--r-- | drivers/staging/media/rkisp1/rkisp1-capture.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c index 6d2fd27970f2..b81235afd053 100644 --- a/drivers/staging/media/rkisp1/rkisp1-capture.c +++ b/drivers/staging/media/rkisp1/rkisp1-capture.c @@ -895,6 +895,8 @@ static void rkisp1_pipeline_stream_disable(struct rkisp1_capture *cap) { struct rkisp1_device *rkisp1 = cap->rkisp1; + rkisp1_cap_stream_disable(cap); + /* * If the other capture is streaming, isp and sensor nodes shouldn't * be disabled, skip them. @@ -907,8 +909,6 @@ static void rkisp1_pipeline_stream_disable(struct rkisp1_capture *cap) v4l2_subdev_call(&rkisp1->resizer_devs[cap->id].sd, video, s_stream, false); - - rkisp1_cap_stream_disable(cap); } /* |