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

media: hantro: Only use postproc when post processed formats are defined 



If the variant doesn't support postprocessed formats make sure it will
be ok.

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

drivers/staging/media/hantro/hantro.h

+2 −6
Original line number Diff line number Diff line
@@ -413,12 +413,8 @@ hantro_get_dst_buf(struct hantro_ctx *ctx) 
	return v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);

}



static inline bool

hantro_needs_postproc(const struct hantro_ctx *ctx,

		      const struct hantro_fmt *fmt)

{

	return !ctx->is_encoder && fmt->fourcc != V4L2_PIX_FMT_NV12;

}

bool hantro_needs_postproc(const struct hantro_ctx *ctx,

			   const struct hantro_fmt *fmt);



static inline dma_addr_t

hantro_get_dec_buf_addr(struct hantro_ctx *ctx, struct vb2_buffer *vb)

drivers/staging/media/hantro/hantro_postproc.c

+14 −0
Original line number Diff line number Diff line
@@ -50,6 +50,20 @@ const struct hantro_postproc_regs hantro_g1_postproc_regs = { 
	.display_width = {G1_REG_PP_DISPLAY_WIDTH, 0, 0xfff},

};



bool hantro_needs_postproc(const struct hantro_ctx *ctx,

			   const struct hantro_fmt *fmt)

{

	struct hantro_dev *vpu = ctx->dev;



	if (ctx->is_encoder)

		return false;



	if (!vpu->variant->postproc_fmts)

		return false;



	return fmt->fourcc != V4L2_PIX_FMT_NV12;

}



void hantro_postproc_enable(struct hantro_ctx *ctx)

{

	struct hantro_dev *vpu = ctx->dev;

drivers/staging/media/hantro/hantro_v4l2.c

+3 −1
Original line number Diff line number Diff line
@@ -55,7 +55,9 @@ static const struct hantro_fmt * 
hantro_get_postproc_formats(const struct hantro_ctx *ctx,

			    unsigned int *num_fmts)

{

	if (ctx->is_encoder) {

	struct hantro_dev *vpu = ctx->dev;



	if (ctx->is_encoder || !vpu->variant->postproc_fmts) {

		*num_fmts = 0;

		return NULL;

	}