Commit a074aa47 authored by Jonas Karlman's avatar Jonas Karlman Committed by Mauro Carvalho Chehab
Browse files

media: rkvdec: h264: Fix bit depth wrap in pps packet 



The luma and chroma bit depth fields in the pps packet are 3 bits wide.
8 is wrongly added to the bit depth values written to these 3 bit fields.
Because only the 3 LSB are written, the hardware was configured
correctly.

Correct this by not adding 8 to the luma and chroma bit depth value.

Fixes: cd33c830 ("media: rkvdec: Add the rkvdec driver")
Signed-off-by: default avatarJonas Karlman <jonas@kwiboo.se>
Signed-off-by: default avatarNicolas Dufresne <nicolas.dufresne@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@kernel.org>
parent 7ab889f0

drivers/staging/media/rkvdec/rkvdec-h264.c

+2 −2
Original line number Diff line number Diff line
@@ -662,8 +662,8 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx, 
	WRITE_PPS(0xff, PROFILE_IDC);

	WRITE_PPS(1, CONSTRAINT_SET3_FLAG);

	WRITE_PPS(sps->chroma_format_idc, CHROMA_FORMAT_IDC);

	WRITE_PPS(sps->bit_depth_luma_minus8 + 8, BIT_DEPTH_LUMA);

	WRITE_PPS(sps->bit_depth_chroma_minus8 + 8, BIT_DEPTH_CHROMA);

	WRITE_PPS(sps->bit_depth_luma_minus8, BIT_DEPTH_LUMA);

	WRITE_PPS(sps->bit_depth_chroma_minus8, BIT_DEPTH_CHROMA);

	WRITE_PPS(0, QPPRIME_Y_ZERO_TRANSFORM_BYPASS_FLAG);

	WRITE_PPS(sps->log2_max_frame_num_minus4, LOG2_MAX_FRAME_NUM_MINUS4);

	WRITE_PPS(sps->max_num_ref_frames, MAX_NUM_REF_FRAMES);