drm/amdgpu: refine imu firmware loading

refine imu 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/imu_v11_0.c b/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c
index 3e91a8e42c21cd2ee8175dbcc241350477146a98..a9f5d9e4610de3bc12585acd98621632214fcb77 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c
@@ -41,7 +41,6 @@ MODULE_FIRMWARE("amdgpu/gc_11_5_1_imu.bin");
 
 static int imu_v11_0_init_microcode(struct amdgpu_device *adev)
 {
-       char fw_name[45];
        char ucode_prefix[30];
        int err;
        const struct imu_firmware_header_v1_0 *imu_hdr;
@@ -50,11 +49,10 @@ static int imu_v11_0_init_microcode(struct amdgpu_device *adev)
        DRM_DEBUG("\n");
 
        amdgpu_ucode_ip_version_decode(adev, GC_HWIP, ucode_prefix, sizeof(ucode_prefix));
-
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_imu.bin", ucode_prefix);
-       err = amdgpu_ucode_request(adev, &adev->gfx.imu_fw, fw_name);
+       err = amdgpu_ucode_request(adev, &adev->gfx.imu_fw, "amdgpu/%s_imu.bin", ucode_prefix);
        if (err)
                goto out;
+
        imu_hdr = (const struct imu_firmware_header_v1_0 *)adev->gfx.imu_fw->data;
        //adev->gfx.imu_feature_version = le32_to_cpu(imu_hdr->ucode_feature_version);
        
@@ -75,8 +73,8 @@ static int imu_v11_0_init_microcode(struct amdgpu_device *adev)
 out:
        if (err) {
                dev_err(adev->dev,
-                       "gfx11: Failed to load firmware \"%s\"\n",
-                       fw_name);
+                       "gfx11: Failed to load firmware \"%s_imu.bin\"\n",
+                       ucode_prefix);
                amdgpu_ucode_release(&adev->gfx.imu_fw);
        }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/imu_v12_0.c b/drivers/gpu/drm/amd/amdgpu/imu_v12_0.c
index 6ff9cf27059a9b356cfa1d2b84af7c7d828dbd2b..1341f02920314e60d766e3df127c4236e32604a3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/imu_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/imu_v12_0.c
@@ -39,7 +39,6 @@ MODULE_FIRMWARE("amdgpu/gc_12_0_1_imu.bin");
 
 static int imu_v12_0_init_microcode(struct amdgpu_device *adev)
 {
-       char fw_name[40];
        char ucode_prefix[15];
        int err;
        const struct imu_firmware_header_v1_0 *imu_hdr;
@@ -48,11 +47,10 @@ static int imu_v12_0_init_microcode(struct amdgpu_device *adev)
        DRM_DEBUG("\n");
 
        amdgpu_ucode_ip_version_decode(adev, GC_HWIP, ucode_prefix, sizeof(ucode_prefix));
-
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_imu.bin", ucode_prefix);
-       err = amdgpu_ucode_request(adev, &adev->gfx.imu_fw, fw_name);
+       err = amdgpu_ucode_request(adev, &adev->gfx.imu_fw, "amdgpu/%s_imu.bin", ucode_prefix);
        if (err)
                goto out;
+
        imu_hdr = (const struct imu_firmware_header_v1_0 *)adev->gfx.imu_fw->data;
        adev->gfx.imu_fw_version = le32_to_cpu(imu_hdr->header.ucode_version);
 
@@ -72,8 +70,8 @@ static int imu_v12_0_init_microcode(struct amdgpu_device *adev)
 out:
        if (err) {
                dev_err(adev->dev,
-                       "gfx12: Failed to load firmware \"%s\"\n",
-                       fw_name);
+                       "gfx12: Failed to load firmware \"%s_imu.bin\"\n",
+                       ucode_prefix);
                amdgpu_ucode_release(&adev->gfx.imu_fw);
        }