]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/amdgpu: refine gpu_info firmware loading
authorYang Wang <kevinyang.wang@amd.com>
Thu, 30 May 2024 14:47:19 +0000 (22:47 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 14 Jun 2024 20:15:59 +0000 (16:15 -0400)
refine gpu_info 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>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

index d549de26f931aa93d292754f3d0544f377717db8..7df5544ac9839e3d0aa96f8cd225360df7ed3e64 100644 (file)
@@ -2350,7 +2350,6 @@ void amdgpu_device_set_sriov_virtual_display(struct amdgpu_device *adev)
 static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
 {
        const char *chip_name;
-       char fw_name[40];
        int err;
        const struct gpu_info_firmware_header_v1_0 *hdr;
 
@@ -2384,12 +2383,12 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
                break;
        }
 
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_gpu_info.bin", chip_name);
-       err = amdgpu_ucode_request(adev, &adev->firmware.gpu_info_fw, fw_name);
+       err = amdgpu_ucode_request(adev, &adev->firmware.gpu_info_fw,
+                                  "amdgpu/%s_gpu_info.bin", chip_name);
        if (err) {
                dev_err(adev->dev,
-                       "Failed to get gpu_info firmware \"%s\"\n",
-                       fw_name);
+                       "Failed to get gpu_info firmware \"%s_gpu_info.bin\"\n",
+                       chip_name);
                goto out;
        }