OSDN Git Service

drm/amdgpu/gfx10: drop unused cyan skillfish firmware
authorAlex Deucher <alexander.deucher@amd.com>
Tue, 1 Mar 2022 15:51:54 +0000 (10:51 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 2 Mar 2022 23:40:07 +0000 (18:40 -0500)
Leftover from bring up.  Not used anymore.

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c

index 92fdccc..713d39d 100644 (file)
@@ -250,13 +250,6 @@ MODULE_FIRMWARE("amdgpu/yellow_carp_mec.bin");
 MODULE_FIRMWARE("amdgpu/yellow_carp_mec2.bin");
 MODULE_FIRMWARE("amdgpu/yellow_carp_rlc.bin");
 
-MODULE_FIRMWARE("amdgpu/cyan_skillfish_ce.bin");
-MODULE_FIRMWARE("amdgpu/cyan_skillfish_pfp.bin");
-MODULE_FIRMWARE("amdgpu/cyan_skillfish_me.bin");
-MODULE_FIRMWARE("amdgpu/cyan_skillfish_mec.bin");
-MODULE_FIRMWARE("amdgpu/cyan_skillfish_mec2.bin");
-MODULE_FIRMWARE("amdgpu/cyan_skillfish_rlc.bin");
-
 MODULE_FIRMWARE("amdgpu/cyan_skillfish2_ce.bin");
 MODULE_FIRMWARE("amdgpu/cyan_skillfish2_pfp.bin");
 MODULE_FIRMWARE("amdgpu/cyan_skillfish2_me.bin");
@@ -4043,10 +4036,7 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
                break;
        case IP_VERSION(10, 1, 3):
        case IP_VERSION(10, 1, 4):
-               if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2)
-                       chip_name = "cyan_skillfish2";
-               else
-                       chip_name = "cyan_skillfish";
+               chip_name = "cyan_skillfish2";
                break;
        case IP_VERSION(10, 3, 7):
                chip_name = "gc_10_3_7";