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: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
index 7f4bf2e..b7dad4e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
@@ -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");
        else
                snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name);
-       err = request_firmware(&adev->gmc.fw, fw_name, adev->dev);
-       if (err)
-               goto out;
-
-       err = amdgpu_ucode_validate(adev->gmc.fw);
-
-out:
+       err = amdgpu_ucode_request(adev, &adev->gmc.fw, fw_name);
        if (err) {
                dev_err(adev->dev,
                       "si_mc: Failed to load firmware \"%s\"\n",
                       fw_name);
-               release_firmware(adev->gmc.fw);
-               adev->gmc.fw = NULL;
+               amdgpu_ucode_release(&adev->gmc.fw);
        }
        return err;
 }
@@ -894,8 +887,7 @@ static int gmc_v6_0_sw_fini(void *handle)
        amdgpu_vm_manager_fini(adev);
        amdgpu_gart_table_vram_free(adev);
        amdgpu_bo_fini(adev);
-       release_firmware(adev->gmc.fw);
-       adev->gmc.fw = NULL;
+       amdgpu_ucode_release(&adev->gmc.fw);
 
        return 0;
 }