]> www.infradead.org Git - nvme.git/commitdiff
drm/amdgpu: don't use amdgpu_lookup_format_info on gfx12
authorMarek Olšák <marek.olsak@amd.com>
Sat, 1 Jun 2024 21:25:51 +0000 (17:25 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 1 Jul 2024 20:10:46 +0000 (16:10 -0400)
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 <marek.olsak@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

index 3c5fb907bdd90961e7feb0c47ffd3e0cda263a0f..b69a4e1b864b11d8c7a87a10099a0571accd5119 100644 (file)
@@ -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),