drm/amdgpu: refine gfx12 firmware loading

refine gfx12 firmware loading

Signed-off-by: Yang Wang <kevinyang.wang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
index 460bf33a22b14aff394577d2dddad777f0cce096..e9559bdd826452978c5ff5e5e41d11d07fdb4c11 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
@@ -386,10 +386,9 @@ static int gfx_v12_0_init_toc_microcode(struct amdgpu_device *adev, const char *
 {
        const struct psp_firmware_header_v1_0 *toc_hdr;
        int err = 0;
-       char fw_name[40];
 
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_toc.bin", ucode_prefix);
-       err = amdgpu_ucode_request(adev, &adev->psp.toc_fw, fw_name);
+       err = amdgpu_ucode_request(adev, &adev->psp.toc_fw,
+                                  "amdgpu/%s_toc.bin", ucode_prefix);
        if (err)
                goto out;
 
@@ -407,7 +406,6 @@ out:
 
 static int gfx_v12_0_init_microcode(struct amdgpu_device *adev)
 {
-       char fw_name[40];
        char ucode_prefix[15];
        int err;
        const struct rlc_firmware_header_v2_0 *rlc_hdr;
@@ -418,23 +416,23 @@ static int gfx_v12_0_init_microcode(struct amdgpu_device *adev)
 
        amdgpu_ucode_ip_version_decode(adev, GC_HWIP, ucode_prefix, sizeof(ucode_prefix));
 
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_pfp.bin", ucode_prefix);
-       err = amdgpu_ucode_request(adev, &adev->gfx.pfp_fw, fw_name);
+       err = amdgpu_ucode_request(adev, &adev->gfx.pfp_fw,
+                                  "amdgpu/%s_pfp.bin", ucode_prefix);
        if (err)
                goto out;
        amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_RS64_PFP);
        amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_RS64_PFP_P0_STACK);
 
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_me.bin", ucode_prefix);
-       err = amdgpu_ucode_request(adev, &adev->gfx.me_fw, fw_name);
+       err = amdgpu_ucode_request(adev, &adev->gfx.me_fw,
+                                  "amdgpu/%s_me.bin", ucode_prefix);
        if (err)
                goto out;
        amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_RS64_ME);
        amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_RS64_ME_P0_STACK);
 
        if (!amdgpu_sriov_vf(adev)) {
-               snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_rlc.bin", ucode_prefix);
-               err = amdgpu_ucode_request(adev, &adev->gfx.rlc_fw, fw_name);
+               err = amdgpu_ucode_request(adev, &adev->gfx.rlc_fw,
+                                          "amdgpu/%s_rlc.bin", ucode_prefix);
                if (err)
                        goto out;
                rlc_hdr = (const struct rlc_firmware_header_v2_0 *)adev->gfx.rlc_fw->data;
@@ -445,8 +443,8 @@ static int gfx_v12_0_init_microcode(struct amdgpu_device *adev)
                        goto out;
        }
 
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec.bin", ucode_prefix);
-       err = amdgpu_ucode_request(adev, &adev->gfx.mec_fw, fw_name);
+       err = amdgpu_ucode_request(adev, &adev->gfx.mec_fw,
+                                  "amdgpu/%s_mec.bin", ucode_prefix);
        if (err)
                goto out;
        amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_RS64_MEC);