media: hantro: HEVC: Fix tile info buffer value computation

BugLink: https://bugs.launchpad.net/bugs/1981864
[ Upstream commit d7f4149df818463c1d7094b35db6ebd79f46c7bd ]

Use pps->column_width_minus1[j] + 1 as value for the tile info buffer
instead of pps->column_width_minus1[j + 1].
The patch fixes DBLK_E_VIXS_2, DBLK_F_VIXS_2, DBLK_G_VIXS_2,
SAO_B_MediaTek_5, TILES_A_Cisco_2 and TILES_B_Cisco_1 tests in fluster.

Fixes: cb5dd5a0fa51 ("media: hantro: Introduce G2/HEVC decoder")
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/staging/media/hantro/hantro_g2_hevc_dec.c b/drivers/staging/media/hantro/hantro_g2_hevc_dec.c
index ee069564205a245c5be2fffed38c5524ca8fb648..e63b777d426607cb680257ad233b3d2510da81af 100644 (file)
--- a/drivers/staging/media/hantro/hantro_g2_hevc_dec.c
+++ b/drivers/staging/media/hantro/hantro_g2_hevc_dec.c
@@ -74,7 +74,7 @@ static void prepare_tile_info_buffer(struct hantro_ctx *ctx)
                                        no_chroma = 1;
                                for (j = 0, tmp_w = 0; j < num_tile_cols - 1; j++) {
                                        tmp_w += pps->column_width_minus1[j] + 1;
-                                       *p++ = pps->column_width_minus1[j + 1];
+                                       *p++ = pps->column_width_minus1[j] + 1;
                                        *p++ = h;
                                        if (i == 0 && h == 1 && ctb_size == 16)
                                                no_chroma = 1;