Commit db6f68b5 authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Mauro Carvalho Chehab
Browse files

media: verisilicon: Do not set context src/dst formats in reset functions 



Setting context source and destination formats should only be done
in hantro_set_fmt_out() and hantro_set_fmt_cap() after check that
the targeted queue is not busy.
Remove these calls from hantro_reset_encoded_fmt() and
hantro_reset_raw_fmt() to clean the driver.

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: default avatarEzequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 960badda

drivers/media/platform/verisilicon/hantro_v4l2.c

+2 −7
Original line number Diff line number Diff line
@@ -382,13 +382,10 @@ hantro_reset_encoded_fmt(struct hantro_ctx *ctx) 


	vpu_fmt = hantro_get_default_fmt(ctx, true);



	if (ctx->is_encoder) {

		ctx->vpu_dst_fmt = vpu_fmt;

	if (ctx->is_encoder)

		fmt = &ctx->dst_fmt;

	} else {

		ctx->vpu_src_fmt = vpu_fmt;

	else

		fmt = &ctx->src_fmt;

	}



	hantro_reset_fmt(fmt, vpu_fmt);

	fmt->width = vpu_fmt->frmsize.min_width;
@@ -408,11 +405,9 @@ hantro_reset_raw_fmt(struct hantro_ctx *ctx) 
	raw_vpu_fmt = hantro_get_default_fmt(ctx, false);



	if (ctx->is_encoder) {

		ctx->vpu_src_fmt = raw_vpu_fmt;

		raw_fmt = &ctx->src_fmt;

		encoded_fmt = &ctx->dst_fmt;

	} else {

		ctx->vpu_dst_fmt = raw_vpu_fmt;

		raw_fmt = &ctx->dst_fmt;

		encoded_fmt = &ctx->src_fmt;

	}