Commit 2d70575b authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher

drm/amd: Use `amdgpu_ucode_*` helpers for GMC6

The `amdgpu_ucode_request` helper will ensure that the return code for
missing firmware is -ENODEV so that early_init can fail.

The `amdgpu_ucode_release` helper is for symmetry on unloading.
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0aaafb73
...@@ -131,19 +131,12 @@ static int gmc_v6_0_init_microcode(struct amdgpu_device *adev) ...@@ -131,19 +131,12 @@ static int gmc_v6_0_init_microcode(struct amdgpu_device *adev)
snprintf(fw_name, sizeof(fw_name), "amdgpu/si58_mc.bin"); snprintf(fw_name, sizeof(fw_name), "amdgpu/si58_mc.bin");
else else
snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name); snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name);
err = request_firmware(&adev->gmc.fw, fw_name, adev->dev); err = amdgpu_ucode_request(adev, &adev->gmc.fw, fw_name);
if (err)
goto out;
err = amdgpu_ucode_validate(adev->gmc.fw);
out:
if (err) { if (err) {
dev_err(adev->dev, dev_err(adev->dev,
"si_mc: Failed to load firmware \"%s\"\n", "si_mc: Failed to load firmware \"%s\"\n",
fw_name); fw_name);
release_firmware(adev->gmc.fw); amdgpu_ucode_release(&adev->gmc.fw);
adev->gmc.fw = NULL;
} }
return err; return err;
} }
...@@ -894,8 +887,7 @@ static int gmc_v6_0_sw_fini(void *handle) ...@@ -894,8 +887,7 @@ static int gmc_v6_0_sw_fini(void *handle)
amdgpu_vm_manager_fini(adev); amdgpu_vm_manager_fini(adev);
amdgpu_gart_table_vram_free(adev); amdgpu_gart_table_vram_free(adev);
amdgpu_bo_fini(adev); amdgpu_bo_fini(adev);
release_firmware(adev->gmc.fw); amdgpu_ucode_release(&adev->gmc.fw);
adev->gmc.fw = NULL;
return 0; return 0;
} }
......
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