diff options
| author | Philipp Zabel | 2018-06-29 14:46:48 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2018-07-04 14:29:31 +0200 |
| commit | 2b84e2a0092c74e4ccc7933a06014e850c905a55 (patch) | |
| tree | bf61f7ce82ccc689aeace78c64f5d0e5b3d12ee2 /drivers/media/platform/coda | |
| parent | media: coda: jpeg: only queue two buffers into the bitstream for JPEG on CODA... (diff) | |
| download | kernel-qcow2-linux-2b84e2a0092c74e4ccc7933a06014e850c905a55.tar.gz kernel-qcow2-linux-2b84e2a0092c74e4ccc7933a06014e850c905a55.tar.xz kernel-qcow2-linux-2b84e2a0092c74e4ccc7933a06014e850c905a55.zip | |
media: coda: jpeg: explicitly disable thumbnails in SEQ_INIT
Explicitly clear DEC_SEQ_JPG_THUMB_EN during sequence initialization.
Not clearing the register does not cause problems, since the only other
codec (MPEG-4 decode) that writes to this register happens to always
write 0 as well.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/platform/coda')
| -rw-r--r-- | drivers/media/platform/coda/coda-bit.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/coda/coda_regs.h | 1 |
2 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 e2994b3ddbf2..92044b779f59 100644 --- a/drivers/media/platform/coda/coda-bit.c +++ b/drivers/media/platform/coda/coda-bit.c @@ -1679,6 +1679,8 @@ static int __coda_start_decoding(struct coda_ctx *ctx) coda_write(dev, 512, CODA_CMD_DEC_SEQ_SPP_CHUNK_SIZE); } } + if (src_fourcc == V4L2_PIX_FMT_JPEG) + coda_write(dev, 0, CODA_CMD_DEC_SEQ_JPG_THUMB_EN); if (dev->devtype->product != CODA_960) coda_write(dev, 0, CODA_CMD_DEC_SEQ_SRC_SIZE); diff --git a/drivers/media/platform/coda/coda_regs.h b/drivers/media/platform/coda/coda_regs.h index 3b650b8aabe9..5e7b00a97671 100644 --- a/drivers/media/platform/coda/coda_regs.h +++ b/drivers/media/platform/coda/coda_regs.h @@ -157,6 +157,7 @@ #define CODA_CMD_DEC_SEQ_START_BYTE 0x190 #define CODA_CMD_DEC_SEQ_PS_BB_START 0x194 #define CODA_CMD_DEC_SEQ_PS_BB_SIZE 0x198 +#define CODA_CMD_DEC_SEQ_JPG_THUMB_EN 0x19c #define CODA_CMD_DEC_SEQ_MP4_ASP_CLASS 0x19c #define CODA_MP4_CLASS_MPEG4 0 #define CODA_CMD_DEC_SEQ_X264_MV_EN 0x19c |