Commit 3c5b218c authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Mauro Carvalho Chehab
Browse files

media: hantro: move postproc enablement for old cores 



Older G2 cores, like that in Allwinner H6, seem to have issue with
latching postproc register values if this is first thing done in job.
Moving that to the end solves the issue.

Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Reviewed-by: default avatarAndrzej Pietrasiewicz <andrzej.p@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+huawei@kernel.org>
parent 6a7c3219

drivers/staging/media/hantro/hantro.h

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ struct hantro_irq { 
 * @num_regs:			number of register range names in the array

 * @double_buffer:		core needs double buffering

 * @legacy_regs:		core uses legacy register set

 * @late_postproc:		postproc must be set up at the end of the job

 */

struct hantro_variant {

	unsigned int enc_offset;
@@ -98,6 +99,7 @@ struct hantro_variant { 
	int num_regs;

	unsigned int double_buffer : 1;

	unsigned int legacy_regs : 1;

	unsigned int late_postproc : 1;

};



/**

drivers/staging/media/hantro/hantro_drv.c

+8 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ 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 (!ctx->is_encoder && !ctx->dev->variant->late_postproc) {

		if (hantro_needs_postproc(ctx, ctx->vpu_dst_fmt))

			hantro_postproc_enable(ctx);

		else
@@ -142,6 +142,13 @@ void hantro_end_prepare_run(struct hantro_ctx *ctx) 
{

	struct vb2_v4l2_buffer *src_buf;



	if (!ctx->is_encoder && ctx->dev->variant->late_postproc) {

		if (hantro_needs_postproc(ctx, ctx->vpu_dst_fmt))

			hantro_postproc_enable(ctx);

		else

			hantro_postproc_disable(ctx);

	}



	src_buf = hantro_get_src_buf(ctx);

	v4l2_ctrl_request_complete(src_buf->vb2_buf.req_obj.req,

				   &ctx->ctrl_handler);