Re: [PATCH 1/3] drm/amdgpu: remove unused gpu_info firmwares

[Christian König]

Am 01.03.22 um 17:01 schrieb Alex Deucher:

These were leftover from bring up and are no longer
necessary.  The information is available via
the IP discovery table.

Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>

Acked-by: Christian König <christian.koe...@amd.com> for the whole series.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 23 ----------------------
  1 file changed, 23 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 6113ddc765a7..2f732a1758d6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -80,12 +80,7 @@ MODULE_FIRMWARE("amdgpu/raven_gpu_info.bin");
  MODULE_FIRMWARE("amdgpu/picasso_gpu_info.bin");
  MODULE_FIRMWARE("amdgpu/raven2_gpu_info.bin");
  MODULE_FIRMWARE("amdgpu/arcturus_gpu_info.bin");
-MODULE_FIRMWARE("amdgpu/renoir_gpu_info.bin");
-MODULE_FIRMWARE("amdgpu/navi10_gpu_info.bin");
-MODULE_FIRMWARE("amdgpu/navi14_gpu_info.bin");
  MODULE_FIRMWARE("amdgpu/navi12_gpu_info.bin");
-MODULE_FIRMWARE("amdgpu/vangogh_gpu_info.bin");
-MODULE_FIRMWARE("amdgpu/yellow_carp_gpu_info.bin");

#define AMDGPU_RESUME_MS 2000

  #define AMDGPU_MAX_RETRY_LIMIT                2
@@ -1992,27 +1987,9 @@ static int amdgpu_device_parse_gpu_info_fw(struct 
amdgpu_device *adev)
        case CHIP_ARCTURUS:
                chip_name = "arcturus";
                break;
-       case CHIP_RENOIR:
-               if (adev->apu_flags & AMD_APU_IS_RENOIR)
-                       chip_name = "renoir";
-               else
-                       chip_name = "green_sardine";
-               break;
-       case CHIP_NAVI10:
-               chip_name = "navi10";
-               break;
-       case CHIP_NAVI14:
-               chip_name = "navi14";
-               break;
        case CHIP_NAVI12:
                chip_name = "navi12";
                break;
-       case CHIP_VANGOGH:
-               chip_name = "vangogh";
-               break;
-       case CHIP_YELLOW_CARP:
-               chip_name = "yellow_carp";
-               break;
        }

snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_gpu_info.bin", chip_name);