Commit e34bca49 authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Mauro Carvalho Chehab
Browse files

media: hantro: Read be32 words starting at every fourth byte 



Since (luma/chroma)_qtable is an array of unsigned char, indexing it
returns consecutive byte locations, but we are supposed to read the arrays
in four-byte words. Consequently, we should be pointing
get_unaligned_be32() at consecutive word locations instead.

Signed-off-by: default avatarAndrzej Pietrasiewicz <andrzej.p@collabora.com>
Reviewed-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Tested-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Cc: stable@vger.kernel.org
Fixes: 00c30f42 "media: rockchip vpu: remove some unused vars"
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 26e1ff53

drivers/staging/media/hantro/hantro_h1_jpeg_enc.c

+7 −2
Original line number Diff line number Diff line
@@ -67,12 +67,17 @@ hantro_h1_jpeg_enc_set_qtable(struct hantro_dev *vpu, 
			      unsigned char *chroma_qtable)

{

	u32 reg, i;

	__be32 *luma_qtable_p;

	__be32 *chroma_qtable_p;



	luma_qtable_p = (__be32 *)luma_qtable;

	chroma_qtable_p = (__be32 *)chroma_qtable;



	for (i = 0; i < H1_JPEG_QUANT_TABLE_COUNT; i++) {

		reg = get_unaligned_be32(&luma_qtable[i]);

		reg = get_unaligned_be32(&luma_qtable_p[i]);

		vepu_write_relaxed(vpu, reg, H1_REG_JPEG_LUMA_QUAT(i));



		reg = get_unaligned_be32(&chroma_qtable[i]);

		reg = get_unaligned_be32(&chroma_qtable_p[i]);

		vepu_write_relaxed(vpu, reg, H1_REG_JPEG_CHROMA_QUAT(i));

	}

}

drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c

+7 −2
Original line number Diff line number Diff line
@@ -98,12 +98,17 @@ rk3399_vpu_jpeg_enc_set_qtable(struct hantro_dev *vpu, 
			       unsigned char *chroma_qtable)

{

	u32 reg, i;

	__be32 *luma_qtable_p;

	__be32 *chroma_qtable_p;



	luma_qtable_p = (__be32 *)luma_qtable;

	chroma_qtable_p = (__be32 *)chroma_qtable;



	for (i = 0; i < VEPU_JPEG_QUANT_TABLE_COUNT; i++) {

		reg = get_unaligned_be32(&luma_qtable[i]);

		reg = get_unaligned_be32(&luma_qtable_p[i]);

		vepu_write_relaxed(vpu, reg, VEPU_REG_JPEG_LUMA_QUAT(i));



		reg = get_unaligned_be32(&chroma_qtable[i]);

		reg = get_unaligned_be32(&chroma_qtable_p[i]);

		vepu_write_relaxed(vpu, reg, VEPU_REG_JPEG_CHROMA_QUAT(i));

	}

}