drm/amdgpu/sdma5.2: Adjust the name string for firmware
authorAlex Deucher <alexander.deucher@amd.com>
Tue, 8 Feb 2022 21:49:44 +0000 (16:49 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 16 Feb 2022 21:44:40 +0000 (16:44 -0500)
This will make it easier to add new firmwares in the future.

Reviewed-by: Guchun Chen <guchun.chen@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c

index d3d6d5b045b83dadaadcf85b1d8f88422de58847..2c0f1e84a5630eb193de539606018db3650c9c27 100644 (file)
@@ -138,28 +138,28 @@ static int sdma_v5_2_init_microcode(struct amdgpu_device *adev)
 
        switch (adev->ip_versions[SDMA0_HWIP][0]) {
        case IP_VERSION(5, 2, 0):
-               chip_name = "sienna_cichlid";
+               chip_name = "sienna_cichlid_sdma";
                break;
        case IP_VERSION(5, 2, 2):
-               chip_name = "navy_flounder";
+               chip_name = "navy_flounder_sdma";
                break;
        case IP_VERSION(5, 2, 1):
-               chip_name = "vangogh";
+               chip_name = "vangogh_sdma";
                break;
        case IP_VERSION(5, 2, 4):
-               chip_name = "dimgrey_cavefish";
+               chip_name = "dimgrey_cavefish_sdma";
                break;
        case IP_VERSION(5, 2, 5):
-               chip_name = "beige_goby";
+               chip_name = "beige_goby_sdma";
                break;
        case IP_VERSION(5, 2, 3):
-               chip_name = "yellow_carp";
+               chip_name = "yellow_carp_sdma";
                break;
        default:
                BUG();
        }
 
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma.bin", chip_name);
+       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s.bin", chip_name);
 
        err = request_firmware(&adev->sdma.instance[0].fw, fw_name, adev->dev);
        if (err)