From: Marek Olšák Date: Sat, 1 Jun 2024 21:25:51 +0000 (-0400) Subject: drm/amdgpu: don't use amdgpu_lookup_format_info on gfx12 X-Git-Tag: io_uring-6.11-20240722~49^2~7^2~40 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fd536d2e12d6fd8e6b199c343aa6475fa969ed99;p=linux-block.git drm/amdgpu: don't use amdgpu_lookup_format_info on gfx12 It only uses fields for GFX9-11 related to the separate DCC buffer, which doesn't exist in GFX12. Signed-off-by: Marek Olšák Acked-by: Alex Deucher Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index 3c5fb907bdd9..b69a4e1b864b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@ -654,6 +654,10 @@ amdgpu_lookup_format_info(u32 format, uint64_t modifier) if (!IS_AMD_FMT_MOD(modifier)) return NULL; + if (AMD_FMT_MOD_GET(TILE_VERSION, modifier) < AMD_FMT_MOD_TILE_VER_GFX9 || + AMD_FMT_MOD_GET(TILE_VERSION, modifier) >= AMD_FMT_MOD_TILE_VER_GFX12) + return NULL; + if (AMD_FMT_MOD_GET(DCC_RETILE, modifier)) return lookup_format_info(dcc_retile_formats, ARRAY_SIZE(dcc_retile_formats),