summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorPhilipp Zabel2019-04-08 14:32:49 +0200
committerGreg Kroah-Hartman2019-05-31 15:46:17 +0200
commit81a0b6ff0209a6daa2f1d98033511dd618847508 (patch)
treef84c3928cc8fc2ac1a40c2fd3b5a2ad7f4b69794 /drivers/media
parentdmaengine: at_xdmac: remove BUG_ON macro in tasklet (diff)
downloadkernel-qcow2-linux-81a0b6ff0209a6daa2f1d98033511dd618847508.tar.gz
kernel-qcow2-linux-81a0b6ff0209a6daa2f1d98033511dd618847508.tar.xz
kernel-qcow2-linux-81a0b6ff0209a6daa2f1d98033511dd618847508.zip
media: coda: clear error return value before picture run
[ Upstream commit bbeefa7357a648afe70e7183914c87c3878d528d ] The error return value is not written by some firmware codecs, such as MPEG-2 decode on CodaHx4. Clear the error return value before starting the picture run to avoid misinterpreting unrelated values returned by sequence initialization as error return value. 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/coda/coda-bit.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
index d20d3df5778b..a3cfefdbee12 100644
--- a/drivers/media/platform/coda/coda-bit.c
+++ b/drivers/media/platform/coda/coda-bit.c
@@ -1999,6 +1999,9 @@ static int coda_prepare_decode(struct coda_ctx *ctx)
/* Clear decode success flag */
coda_write(dev, 0, CODA_RET_DEC_PIC_SUCCESS);
+ /* Clear error return value */
+ coda_write(dev, 0, CODA_RET_DEC_PIC_ERR_MB);
+
trace_coda_dec_pic_run(ctx, meta);
coda_command_async(ctx, CODA_COMMAND_PIC_RUN);