| From 058536a84e3615706df1dc532ce7dda60ae25ca0 Mon Sep 17 00:00:00 2001 |
| From: Andrzej Pietrasiewicz <andrzej.p@collabora.com> |
| Date: Mon, 27 Jan 2020 15:30:06 +0100 |
| Subject: [PATCH] media: hantro: Read be32 words starting at every fourth byte |
| |
| commit e34bca49e4953e5c2afc0425303199a5fd515f82 upstream. |
| |
| 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: Andrzej Pietrasiewicz <andrzej.p@collabora.com> |
| Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com> |
| Tested-by: Ezequiel Garcia <ezequiel@collabora.com> |
| Cc: stable@vger.kernel.org |
| Fixes: 00c30f42c7595f "media: rockchip vpu: remove some unused vars" |
| Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c b/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c |
| index 06daea66fb49..5db74a0b0e58 100644 |
| --- a/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c |
| +++ b/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c |
| @@ -67,12 +67,17 @@ rk3288_vpu_jpeg_enc_set_qtable(struct rockchip_vpu_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)); |
| } |
| } |
| diff --git a/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c b/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c |
| index 3d438797692e..93c63f05a885 100644 |
| --- a/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c |
| +++ b/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c |
| @@ -98,12 +98,17 @@ rk3399_vpu_jpeg_enc_set_qtable(struct rockchip_vpu_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)); |
| } |
| } |
| -- |
| 2.7.4 |
| |