diff options
| author |  Philipp Zabel <p.zabel@pengutronix.de>
| 2019-12-12 15:02:52 +0100 |
|---|---|---|
| committer |  Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
| 2019-12-16 10:00:11 +0100 |
| commit | eed569c425d0ac1b4b3c287a704372721001feb6 (patch) | |
| tree | 63c63fee062257f04bfcdd7148d49dca281f4899 /drivers/media/platform/coda | |
| parent | media: Drop superfluous ioctl PCM ops (diff) | |
| download | linux-eed569c425d0ac1b4b3c287a704372721001feb6.tar.gz linux-eed569c425d0ac1b4b3c287a704372721001feb6.tar.bz2 linux-eed569c425d0ac1b4b3c287a704372721001feb6.zip | |
media: coda: do not skip finish_run if aborting
Always call finish_run when the hardware signals completion. This
will allow JPEG contexts to clean up even if job_abort was called
during the device_run.
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+huawei@kernel.org>
Diffstat (limited to 'drivers/media/platform/coda')
| -rw-r--r-- | drivers/media/platform/coda/coda-bit.c | 6 | ||||
| -rw-r--r-- | drivers/media/platform/coda/coda-common.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c index 00c7bed3dd57..5475de176ce3 100644 --- a/drivers/media/platform/coda/coda-bit.c +++ b/drivers/media/platform/coda/coda-bit.c @@ -1629,6 +1629,9 @@ static void coda_finish_encode(struct coda_ctx *ctx) struct coda_dev *dev = ctx->dev; u32 wr_ptr, start_ptr; + if (ctx->aborting) + return; + /* * Lock to make sure that an encoder stop command running in parallel * will either already have marked src_buf as last, or it will wake up @@ -2266,6 +2269,9 @@ static void coda_finish_decode(struct coda_ctx *ctx) int err_vdoa = 0; u32 val; + if (ctx->aborting) + return; + /* Update kfifo out pointer from coda bitstream read pointer */ coda_kfifo_sync_from_device(ctx); diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c index 94fb4d2ecc43..556f8e0f52d7 100644 --- a/drivers/media/platform/coda/coda-common.c +++ b/drivers/media/platform/coda/coda-common.c @@ -1421,7 +1421,7 @@ static void coda_pic_run_work(struct work_struct *work) if (ctx->ops->run_timeout) ctx->ops->run_timeout(ctx); - } else if (!ctx->aborting) { + } else { ctx->ops->finish_run(ctx); } |