commit f42eb33ad2feafecb0d4fbf01949ab5ff52307b4
author Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Thu Oct 08 18:51:43 2020 -0400
committer Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Sat Oct 10 17:15:02 2020 -0400
tree 2e4f45b7717600afff97bdfa95a358dd4d624316
parent 53637194b212b7bac08637e58553efe059953d9c

panfrost: Fix faults on block-based formats on Bifrost

Fixes

dEQP-GLES2.functional.texture.filtering.2d.nearest_nearest_clamp_etc1

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7081>

src/panfrost/lib/pan_texture.c

diff --git a/src/panfrost/lib/pan_texture.c b/src/panfrost/lib/pan_texture.c
index ecb7a69..6de8223 100644
--- a/src/panfrost/lib/pan_texture.c
+++ b/src/panfrost/lib/pan_texture.c
@@ -231,14 +231,20 @@
 
 static unsigned
 panfrost_nonlinear_stride(uint64_t modifier,
-                unsigned bytes_per_pixel,
+                unsigned bytes_per_block,
+                unsigned pixels_per_block,
                 unsigned width,
                 unsigned height,
                 bool plane)
 {
         unsigned block_w = panfrost_block_dim(modifier, true, plane);
         unsigned block_h = panfrost_block_dim(modifier, false, plane);
-        unsigned block_size = block_w * block_h * bytes_per_pixel;
+
+        /* Calculate block size. Ensure the division happens only at the end to
+         * avoid rounding errors if bytes per block < pixels per block */
+
+        unsigned block_size = (block_w * block_h * bytes_per_block)
+                / pixels_per_block;
 
         if (height <= block_h)
                 return 0;
@@ -291,6 +297,7 @@
                                                         slices[l].stride :
                                                         panfrost_nonlinear_stride(modifier,
                                                                         MAX2(desc->block.bits / 8, 1),
+                                                                        desc->block.width * desc->block.height,
                                                                         u_minify(width, l),
                                                                         u_minify(height, l), false);
                                         }