fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-19 04:30:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panfrost: Allocate enough space for tiled formats

Browse source 
We need to align and possible reserve space for a header.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Tested-by: Icecream95 <ixn@keemail.me>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6159>
This commit is contained in:
Alyssa Rosenzweig 2020-07-22 13:44:35 -04:00
parent 8c0cb56fd9
commit 4d0241dfed
1 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/gallium/drivers/panfrost/pan_resource.c
View file

@ -218,10 +218,42 @@ panfrost_create_scanout_res(struct pipe_screen *screen,
uint64_t modifier)
{
struct panfrost_device *dev = pan_device(screen);
struct pipe_resource scanout_templat = *template;
struct renderonly_scanout *scanout;
struct winsys_handle handle;
struct pipe_resource *res;
struct pipe_resource scanout_templat = *template;
/* Tiled formats need to be tile aligned */
if (modifier == DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED) {
scanout_templat.width0 = ALIGN_POT(template->width0, 16);
scanout_templat.height0 = ALIGN_POT(template->height0, 16);
}
/* AFBC formats need a header. Thankfully we don't care about the
* stride so we can just use wonky dimensions as long as the right
* number of bytes are allocated at the end of the day... this implies
* that stride/pitch is invalid for AFBC buffers */
if (drm_is_afbc(modifier)) {
/* Space for the header. We need to keep vaguely similar
* dimensions because... reasons... to allocate with renderonly
* as a dumb buffer. To do so, after the usual 16x16 alignment,
* we add on extra rows for the header. The order of operations
* matters here, the extra rows of padding can in fact be
* needed and missing them can lead to faults. */
unsigned header_size = panfrost_afbc_header_size(
template->width0, template->height0);
unsigned pitch = ALIGN_POT(template->width0, 16) *
util_format_get_blocksize(template->format);
unsigned header_rows =
DIV_ROUND_UP(header_size, pitch);
scanout_templat.width0 = ALIGN_POT(template->width0, 16);
scanout_templat.height0 = ALIGN_POT(template->height0, 16) + header_rows;
}
scanout = renderonly_scanout_for_resource(&scanout_templat,
dev->ro, &handle);