Mesa (main): panfrost: Fix polygon list size computations

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: fe9d37b0c6e89f11a5f25022a851da81d19dab73
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fe9d37b0c6e89f11a5f25022a851da81d19dab73

Author: Icecream95 <ixn at disroot.org>
Date:   Sun May 23 07:10:19 2021 +1200

panfrost: Fix polygon list size computations

As noted in f5c293425fa ("panfrost: Correct polygon size computations"),
"We do have to be careful to add the header size to total comptued BO
size."

Fixes: ff3eada7eb4 ("panfrost: Use the generic preload and FB helpers in the gallium driver")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4660
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4737
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10943>

---

 src/panfrost/lib/pan_tiler.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/panfrost/lib/pan_tiler.c b/src/panfrost/lib/pan_tiler.c
index 4493f5c01c9..e45240eeac6 100644
--- a/src/panfrost/lib/pan_tiler.c
+++ b/src/panfrost/lib/pan_tiler.c
@@ -389,5 +389,6 @@ panfrost_tiler_get_polygon_list_size(const struct panfrost_device *dev,
         unsigned hierarchy_mask =
                 panfrost_choose_hierarchy_mask(fb_width, fb_height, 1, hierarchy);
 
-        return panfrost_tiler_full_size(fb_width, fb_height, hierarchy_mask, hierarchy);
+        return panfrost_tiler_full_size(fb_width, fb_height, hierarchy_mask, hierarchy) +
+                panfrost_tiler_header_size(fb_width, fb_height, hierarchy_mask, hierarchy);
 }