Commit 46d7aaeb authored Jul 01, 2020 by Ezequiel Garcia Committed by Mauro Carvalho Chehab Jul 19, 2020

hantro: Make sure we don't use post-processor on an encoder



Commit 986eee3a ("media: hantro: Prevent encoders from using
post-processing") fixed hantro_needs_postproc condition,
but missed one case. Encoders don't have any post-processor
hardware block, so also can't be disabled.

Fix it.

Fixes: 986eee3a ("media: hantro: Prevent encoders from using post-processing")
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+huawei@kernel.org>

parent b72a6342

drivers/staging/media/hantro/hantro_drv.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -122,11 +122,13 @@ void hantro_start_prepare_run(struct hantro_ctx *ctx)
		v4l2_ctrl_request_setup(src_buf->vb2_buf.req_obj.req,
		&ctx->ctrl_handler);

		if (!ctx->is_encoder) {
		if (hantro_needs_postproc(ctx, ctx->vpu_dst_fmt))
		hantro_postproc_enable(ctx);
		else
		hantro_postproc_disable(ctx);
		}
		}

		void hantro_end_prepare_run(struct hantro_ctx *ctx)
		{

Admin message