diff options
| author | Ezequiel Garcia <ezequiel@collabora.com> | 2019-09-03 15:17:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-10-01 16:57:05 -0300 |
| commit | 05e58c83d6311f95677038cf816062234630727e (patch) | |
| tree | f190c6c96cab5c6c376dd24cc41bc3261b31f489 /drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c | |
| parent | 5adff604a51ef13edd00656f26a9ba66865b42af (diff) | |
| download | linux-stable-05e58c83d6311f95677038cf816062234630727e.tar.gz linux-stable-05e58c83d6311f95677038cf816062234630727e.tar.bz2 linux-stable-05e58c83d6311f95677038cf816062234630727e.zip | |
media: hantro: Simplify macroblock macros
It seems all codecs are using a 16x16 size macroblock,
and so it's possible to have just one set of macroblock macros.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Reviewed-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/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c')
| -rw-r--r-- | drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c b/drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c index 06162f569b5e..067892345b5d 100644 --- a/drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c +++ b/drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c @@ -149,8 +149,8 @@ void rk3399_vpu_jpeg_enc_run(struct hantro_ctx *ctx) reg = VEPU_REG_AXI_CTRL_BURST_LEN(16); vepu_write_relaxed(vpu, reg, VEPU_REG_AXI_CTRL); - reg = VEPU_REG_MB_WIDTH(JPEG_MB_WIDTH(ctx->src_fmt.width)) - | VEPU_REG_MB_HEIGHT(JPEG_MB_HEIGHT(ctx->src_fmt.height)) + reg = VEPU_REG_MB_WIDTH(MB_WIDTH(ctx->src_fmt.width)) + | VEPU_REG_MB_HEIGHT(MB_HEIGHT(ctx->src_fmt.height)) | VEPU_REG_FRAME_TYPE_INTRA | VEPU_REG_ENCODE_FORMAT_JPEG | VEPU_REG_ENCODE_ENABLE; |