From 9eb00f612a4bedb75b4b8462eab7319edbc8fc2c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 16 Aug 2023 15:15:00 -0400 Subject: [PATCH] ac/surface: trivial non-functional changes Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/amd/common/ac_surface.c | 19 +++++-------------- src/amd/common/ac_surface_meta_address_test.c | 3 +++ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c index 53fe648..ea91713 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c @@ -1707,6 +1707,8 @@ static void ac_copy_cmask_equation(const struct radeon_info *info, ADDR2_COMPUTE_CMASK_INFO_OUTPUT *cmask, struct gfx9_meta_equation *equation) { + assert(info->gfx_level < GFX11); + equation->meta_block_width = cmask->metaBlkWidth; equation->meta_block_height = cmask->metaBlkHeight; equation->meta_block_depth = 1; @@ -2920,21 +2922,10 @@ static uint32_t ac_surface_get_pitch_align(const struct radeon_info *info, const struct radeon_surf *surf) { if (surf->is_linear) { - switch (info->gfx_level) { - case GFX6: - case GFX7: - case GFX8: - return MAX2(8, 64 / surf->bpe); - - case GFX9: - case GFX10: - case GFX10_3: - case GFX11: + if (info->gfx_level >= GFX9) return 256 / surf->bpe; - - default: - unreachable("unhandled gfx_level"); - } + else + return MAX2(8, 64 / surf->bpe); } if (info->gfx_level >= GFX9) { diff --git a/src/amd/common/ac_surface_meta_address_test.c b/src/amd/common/ac_surface_meta_address_test.c index 731bfa1..57b5605 100644 --- a/src/amd/common/ac_surface_meta_address_test.c +++ b/src/amd/common/ac_surface_meta_address_test.c @@ -729,6 +729,9 @@ int main(int argc, char **argv) for (unsigned i = 0; i < ARRAY_SIZE(testcases); ++i) { struct radeon_info info = get_radeon_info(&testcases[i]); + if (info.gfx_level >= GFX11) + continue; + run_cmask_address_test(testcases[i].name, &info, full); } -- 2.7.4