Commit c37b8f78 authored by Yang Wang's avatar Yang Wang Committed by Alex Deucher

drm/amdgpu: refine imu firmware loading

refine imu firmware loading
Signed-off-by: default avatarYang Wang <kevinyang.wang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3e92af6b
...@@ -41,7 +41,6 @@ MODULE_FIRMWARE("amdgpu/gc_11_5_1_imu.bin"); ...@@ -41,7 +41,6 @@ MODULE_FIRMWARE("amdgpu/gc_11_5_1_imu.bin");
static int imu_v11_0_init_microcode(struct amdgpu_device *adev) static int imu_v11_0_init_microcode(struct amdgpu_device *adev)
{ {
char fw_name[45];
char ucode_prefix[30]; char ucode_prefix[30];
int err; int err;
const struct imu_firmware_header_v1_0 *imu_hdr; const struct imu_firmware_header_v1_0 *imu_hdr;
...@@ -50,11 +49,10 @@ static int imu_v11_0_init_microcode(struct amdgpu_device *adev) ...@@ -50,11 +49,10 @@ static int imu_v11_0_init_microcode(struct amdgpu_device *adev)
DRM_DEBUG("\n"); DRM_DEBUG("\n");
amdgpu_ucode_ip_version_decode(adev, GC_HWIP, ucode_prefix, sizeof(ucode_prefix)); amdgpu_ucode_ip_version_decode(adev, GC_HWIP, ucode_prefix, sizeof(ucode_prefix));
err = amdgpu_ucode_request(adev, &adev->gfx.imu_fw, "amdgpu/%s_imu.bin", 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);
if (err) if (err)
goto out; goto out;
imu_hdr = (const struct imu_firmware_header_v1_0 *)adev->gfx.imu_fw->data; 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); //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) ...@@ -75,8 +73,8 @@ static int imu_v11_0_init_microcode(struct amdgpu_device *adev)
out: out:
if (err) { if (err) {
dev_err(adev->dev, dev_err(adev->dev,
"gfx11: Failed to load firmware \"%s\"\n", "gfx11: Failed to load firmware \"%s_imu.bin\"\n",
fw_name); ucode_prefix);
amdgpu_ucode_release(&adev->gfx.imu_fw); amdgpu_ucode_release(&adev->gfx.imu_fw);
} }
......
...@@ -39,7 +39,6 @@ MODULE_FIRMWARE("amdgpu/gc_12_0_1_imu.bin"); ...@@ -39,7 +39,6 @@ MODULE_FIRMWARE("amdgpu/gc_12_0_1_imu.bin");
static int imu_v12_0_init_microcode(struct amdgpu_device *adev) static int imu_v12_0_init_microcode(struct amdgpu_device *adev)
{ {
char fw_name[40];
char ucode_prefix[15]; char ucode_prefix[15];
int err; int err;
const struct imu_firmware_header_v1_0 *imu_hdr; const struct imu_firmware_header_v1_0 *imu_hdr;
...@@ -48,11 +47,10 @@ static int imu_v12_0_init_microcode(struct amdgpu_device *adev) ...@@ -48,11 +47,10 @@ static int imu_v12_0_init_microcode(struct amdgpu_device *adev)
DRM_DEBUG("\n"); DRM_DEBUG("\n");
amdgpu_ucode_ip_version_decode(adev, GC_HWIP, ucode_prefix, sizeof(ucode_prefix)); amdgpu_ucode_ip_version_decode(adev, GC_HWIP, ucode_prefix, sizeof(ucode_prefix));
err = amdgpu_ucode_request(adev, &adev->gfx.imu_fw, "amdgpu/%s_imu.bin", 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);
if (err) if (err)
goto out; goto out;
imu_hdr = (const struct imu_firmware_header_v1_0 *)adev->gfx.imu_fw->data; 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); 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) ...@@ -72,8 +70,8 @@ static int imu_v12_0_init_microcode(struct amdgpu_device *adev)
out: out:
if (err) { if (err) {
dev_err(adev->dev, dev_err(adev->dev,
"gfx12: Failed to load firmware \"%s\"\n", "gfx12: Failed to load firmware \"%s_imu.bin\"\n",
fw_name); ucode_prefix);
amdgpu_ucode_release(&adev->gfx.imu_fw); amdgpu_ucode_release(&adev->gfx.imu_fw);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment