Commit df9ec2fc authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

hantro: Remove incorrect HEVC SPS validation 



Currently, the driver tries to validat the HEVC SPS
against the CAPTURE queue format (i.e. the decoded format).
This is not correct, because typically the SPS control is set
before the CAPTURE queue is negotiated.

Fixes: 135ad96c ("media: hantro: Be more accurate on pixel formats step_width constraints")
Signed-off-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 143201a6

drivers/staging/media/hantro/hantro_drv.c

+6 −6
Original line number Diff line number Diff line
@@ -251,11 +251,6 @@ queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq) 


static int hantro_try_ctrl(struct v4l2_ctrl *ctrl)

{

	struct hantro_ctx *ctx;



	ctx = container_of(ctrl->handler,

			   struct hantro_ctx, ctrl_handler);



	if (ctrl->id == V4L2_CID_STATELESS_H264_SPS) {

		const struct v4l2_ctrl_h264_sps *sps = ctrl->p_new.p_h264_sps;
@@ -271,7 +266,12 @@ static int hantro_try_ctrl(struct v4l2_ctrl *ctrl) 
	} else if (ctrl->id == V4L2_CID_STATELESS_HEVC_SPS) {

		const struct v4l2_ctrl_hevc_sps *sps = ctrl->p_new.p_hevc_sps;



		return hantro_hevc_validate_sps(ctx, sps);

		if (sps->bit_depth_luma_minus8 != sps->bit_depth_chroma_minus8)

			/* Luma and chroma bit depth mismatch */

			return -EINVAL;

		if (sps->bit_depth_luma_minus8 != 0)

			/* Only 8-bit is supported */

			return -EINVAL;

	} else if (ctrl->id == V4L2_CID_STATELESS_VP9_FRAME) {

		const struct v4l2_ctrl_vp9_frame *dec_params = ctrl->p_new.p_vp9_frame;

drivers/staging/media/hantro/hantro_hevc.c

+1 −8
Original line number Diff line number Diff line
@@ -154,15 +154,8 @@ static int tile_buffer_reallocate(struct hantro_ctx *ctx) 
	return -ENOMEM;

}



int hantro_hevc_validate_sps(struct hantro_ctx *ctx, const struct v4l2_ctrl_hevc_sps *sps)

static int hantro_hevc_validate_sps(struct hantro_ctx *ctx, const struct v4l2_ctrl_hevc_sps *sps)

{

	if (sps->bit_depth_luma_minus8 != sps->bit_depth_chroma_minus8)

		/* Luma and chroma bit depth mismatch */

		return -EINVAL;

	if (sps->bit_depth_luma_minus8 != 0)

		/* Only 8-bit is supported */

		return -EINVAL;



	/*

	 * for tile pixel format check if the width and height match

	 * hardware constraints

drivers/staging/media/hantro/hantro_hw.h

+0 −1
Original line number Diff line number Diff line
@@ -360,7 +360,6 @@ int hantro_hevc_dec_prepare_run(struct hantro_ctx *ctx); 
void hantro_hevc_ref_init(struct hantro_ctx *ctx);

dma_addr_t hantro_hevc_get_ref_buf(struct hantro_ctx *ctx, s32 poc);

int hantro_hevc_add_ref_buf(struct hantro_ctx *ctx, int poc, dma_addr_t addr);

int hantro_hevc_validate_sps(struct hantro_ctx *ctx, const struct v4l2_ctrl_hevc_sps *sps);





static inline unsigned short hantro_vp9_num_sbs(unsigned short dimension)