diff options
| author | Marco Felsch | 2019-06-18 18:45:13 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2019-06-24 20:22:08 +0200 |
| commit | 7e5eaae0af2eccb7ac94eb3d958d4c052f960e7b (patch) | |
| tree | b91cb844573f161362274e2b611e1b8987caff6f /drivers/media/platform | |
| parent | media: coda: add coda_wake_up_capture_queue (diff) | |
| download | kernel-qcow2-linux-7e5eaae0af2eccb7ac94eb3d958d4c052f960e7b.tar.gz kernel-qcow2-linux-7e5eaae0af2eccb7ac94eb3d958d4c052f960e7b.tar.xz kernel-qcow2-linux-7e5eaae0af2eccb7ac94eb3d958d4c052f960e7b.zip | |
media: coda: fix V4L2_DEC_CMD_STOP when all buffers are already consumed
When the DEC_CMD_STOP command is issued after the context has already
consumed all the queued buffers, we need to make sure to wake the
destination queue with last_buffer_dequeued set, to allow userspace to
make progress in its EOS handling.
As there might still be picture run workers pending at that point, we
need to synchronize with them, so the sequence number comparison reads
stable values.
reword commit message]
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/coda/coda-common.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c index 095747ae1c40..43820cfac76c 100644 --- a/drivers/media/platform/coda/coda-common.c +++ b/drivers/media/platform/coda/coda-common.c @@ -1071,6 +1071,12 @@ static int coda_decoder_cmd(struct file *file, void *fh, coda_bit_stream_end_flag(ctx); ctx->hold = false; v4l2_m2m_try_schedule(ctx->fh.m2m_ctx); + + flush_work(&ctx->pic_run_work); + + /* If there is no buffer in flight, wake up */ + if (!ctx->streamon_out || ctx->qsequence == ctx->osequence) + coda_wake_up_capture_queue(ctx); break; default: return -EINVAL; |