From 9f569acf205e983395fbf964df6ba1fe2f7f73f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Wed, 4 Oct 2023 05:17:11 -0400
Subject: [PATCH] ac/surface: don't require exact pitch for gfx6-8 tiled
 imports

It was reported that it broke Stoney. Something probably uses a suboptimal
pitch, like minigbm.

Fixes: 7d066330e0c3d47a0ad - ac/surface: relax custom pitch requirements to any multiple of 256B on gfx10.3+

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25540>
---
 src/amd/common/ac_surface.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c
index cc47d6e15ce..271793798d1 100644
--- a/src/amd/common/ac_surface.c
+++ b/src/amd/common/ac_surface.c
@@ -2997,7 +2997,7 @@ bool ac_surface_override_offset_stride(const struct radeon_info *info, struct ra
    bool require_equal_pitch = surf->surf_size != surf->total_size ||
                               num_layers != 1 ||
                               num_mipmap_levels != 1 ||
-                              !surf->is_linear ||
+                              (info->gfx_level >= GFX9 && !surf->is_linear) ||
                               info->gfx_level == GFX10;
 
    if (info->gfx_level >= GFX9) {