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

media: hantro: vp8: Move noisy WARN_ON to vpu_debug 



When the VP8 decoders can't find a reference frame,
the driver falls back to the current output frame.

This will probably produce some undesirable results,
leading to frame corruption, but shouldn't cause
noisy warnings.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Acked-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Tested-by: default avatarAlex Bee <knaerzche@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 131ae388

drivers/staging/media/hantro/hantro_g1_vp8_dec.c

+10 −3
Original line number Diff line number Diff line
@@ -376,12 +376,17 @@ static void cfg_ref(struct hantro_ctx *ctx, 
	vb2_dst = hantro_get_dst_buf(ctx);



	ref = hantro_get_ref(ctx, hdr->last_frame_ts);

	if (!ref)

	if (!ref) {

		vpu_debug(0, "failed to find last frame ts=%llu\n",

			  hdr->last_frame_ts);

		ref = vb2_dma_contig_plane_dma_addr(&vb2_dst->vb2_buf, 0);

	}

	vdpu_write_relaxed(vpu, ref, G1_REG_ADDR_REF(0));



	ref = hantro_get_ref(ctx, hdr->golden_frame_ts);

	WARN_ON(!ref && hdr->golden_frame_ts);

	if (!ref && hdr->golden_frame_ts)

		vpu_debug(0, "failed to find golden frame ts=%llu\n",

			  hdr->golden_frame_ts);

	if (!ref)

		ref = vb2_dma_contig_plane_dma_addr(&vb2_dst->vb2_buf, 0);

	if (hdr->flags & V4L2_VP8_FRAME_FLAG_SIGN_BIAS_GOLDEN)
@@ -389,7 +394,9 @@ static void cfg_ref(struct hantro_ctx *ctx, 
	vdpu_write_relaxed(vpu, ref, G1_REG_ADDR_REF(4));



	ref = hantro_get_ref(ctx, hdr->alt_frame_ts);

	WARN_ON(!ref && hdr->alt_frame_ts);

	if (!ref && hdr->alt_frame_ts)

		vpu_debug(0, "failed to find alt frame ts=%llu\n",

			  hdr->alt_frame_ts);

	if (!ref)

		ref = vb2_dma_contig_plane_dma_addr(&vb2_dst->vb2_buf, 0);

	if (hdr->flags & V4L2_VP8_FRAME_FLAG_SIGN_BIAS_ALT)

drivers/staging/media/hantro/rockchip_vpu2_hw_vp8_dec.c

+10 −3
Original line number Diff line number Diff line
@@ -453,12 +453,17 @@ static void cfg_ref(struct hantro_ctx *ctx, 
	vb2_dst = hantro_get_dst_buf(ctx);



	ref = hantro_get_ref(ctx, hdr->last_frame_ts);

	if (!ref)

	if (!ref) {

		vpu_debug(0, "failed to find last frame ts=%llu\n",

			  hdr->last_frame_ts);

		ref = vb2_dma_contig_plane_dma_addr(&vb2_dst->vb2_buf, 0);

	}

	vdpu_write_relaxed(vpu, ref, VDPU_REG_VP8_ADDR_REF0);



	ref = hantro_get_ref(ctx, hdr->golden_frame_ts);

	WARN_ON(!ref && hdr->golden_frame_ts);

	if (!ref && hdr->golden_frame_ts)

		vpu_debug(0, "failed to find golden frame ts=%llu\n",

			  hdr->golden_frame_ts);

	if (!ref)

		ref = vb2_dma_contig_plane_dma_addr(&vb2_dst->vb2_buf, 0);

	if (hdr->flags & V4L2_VP8_FRAME_FLAG_SIGN_BIAS_GOLDEN)
@@ -466,7 +471,9 @@ static void cfg_ref(struct hantro_ctx *ctx, 
	vdpu_write_relaxed(vpu, ref, VDPU_REG_VP8_ADDR_REF2_5(2));



	ref = hantro_get_ref(ctx, hdr->alt_frame_ts);

	WARN_ON(!ref && hdr->alt_frame_ts);

	if (!ref && hdr->alt_frame_ts)

		vpu_debug(0, "failed to find alt frame ts=%llu\n",

			  hdr->alt_frame_ts);

	if (!ref)

		ref = vb2_dma_contig_plane_dma_addr(&vb2_dst->vb2_buf, 0);

	if (hdr->flags & V4L2_VP8_FRAME_FLAG_SIGN_BIAS_ALT)