panfrost: Fix polygon list size computations

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

Fixes: ff3eada7eb ("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>
(cherry picked from commit fe9d37b0c6)
This commit is contained in:
Icecream95 2021-05-23 07:10:19 +12:00 committed by Eric Engestrom
parent 90c441eceb
commit c0c43709ea
2 changed files with 3 additions and 2 deletions

View file

@ -220,7 +220,7 @@
"description": "panfrost: Fix polygon list size computations",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "ff3eada7eb4e4df0abe93ee76b77101f9d24e72c"
},

View file

@ -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);
}