From c0404da1e5bc6ab13e73ff78f8fe49082f3ffbab Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Wed, 18 Dec 2024 10:04:14 -0500 Subject: [PATCH] freedreno/fdl: Make tiled r8g8 images have 4k alignment This fixes an unrecoverable hang in the trace from #5926 without having to disable tiling. Part-of: --- src/freedreno/fdl/fd6_layout.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/freedreno/fdl/fd6_layout.c b/src/freedreno/fdl/fd6_layout.c index 9a864769733..31a8002e87d 100644 --- a/src/freedreno/fdl/fd6_layout.c +++ b/src/freedreno/fdl/fd6_layout.c @@ -98,7 +98,8 @@ fdl6_tile_alignment(struct fdl_layout *layout, uint32_t *heightalign) * looser alignment requirements, however the validity of alignment is * heavily undertested and the "officially" supported alignment is 4096b. */ - if (layout->ubwc || util_format_is_depth_or_stencil(layout->format)) + if (layout->ubwc || util_format_is_depth_or_stencil(layout->format) || + is_r8g8(layout)) layout->base_align = 4096; else if (layout->cpp == 1) layout->base_align = 64;