From de6ee5b7821a58b5181cab0e7329dd1928913c2b Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Fri, 5 Aug 2022 08:40:38 -0700 Subject: [PATCH] freedreno/gmem: Fix col0 calc Fix typo in calculation of position of start of a row of tiles. This could otherwise cause an out-of-bounds access in the next patch. Fixes: 81d85be9a5c freedreno/gmem: Reverse order of alternative tile rows Signed-off-by: Rob Clark Part-of: (cherry picked from commit 2497741a1b142b0e19f3946d3f49f064c0c8f119) --- .pick_status.json | 2 +- src/gallium/drivers/freedreno/freedreno_gmem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 36577f65027..d7151406f95 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1012,7 +1012,7 @@ "description": "freedreno/gmem: Fix col0 calc", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "81d85be9a5cfb5860ba5d15f2bf6f1a4946e411e" }, diff --git a/src/gallium/drivers/freedreno/freedreno_gmem.c b/src/gallium/drivers/freedreno/freedreno_gmem.c index 681063f003e..e0b0d95ca8a 100644 --- a/src/gallium/drivers/freedreno/freedreno_gmem.c +++ b/src/gallium/drivers/freedreno/freedreno_gmem.c @@ -433,7 +433,7 @@ gmem_stateobj_init(struct fd_screen *screen, struct gmem_key *key) */ if (!FD_DBG(NOSBIN)) { for (i = 0; i < gmem->nbins_y; i+=2) { - unsigned col0 = gmem->nbins_y * i; + unsigned col0 = gmem->nbins_x * i; for (j = 0; j < gmem->nbins_x/2; j++) { swap(gmem->tile[col0 + j], gmem->tile[col0 + gmem->nbins_x - j - 1]); }