drm/amd: Use `amdgpu_ucode_*` helpers for SDMA on CIK

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/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
index cbca9866645c5ddaee97cdfa81990f67e83000d6..67d16236b2168ddc4b3e8ae66beaa638f30a13a9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
@@ -73,10 +73,9 @@ u32 amdgpu_cik_gpu_check_soft_reset(struct amdgpu_device *adev);
 static void cik_sdma_free_microcode(struct amdgpu_device *adev)
 {
        int i;
-       for (i = 0; i < adev->sdma.num_instances; i++) {
-                       release_firmware(adev->sdma.instance[i].fw);
-                       adev->sdma.instance[i].fw = NULL;
-       }
+
+       for (i = 0; i < adev->sdma.num_instances; i++)
+               amdgpu_ucode_release(&adev->sdma.instance[i].fw);
 }
 
 /*
@@ -137,18 +136,15 @@ static int cik_sdma_init_microcode(struct amdgpu_device *adev)
                        snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma.bin", chip_name);
                else
                        snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma1.bin", chip_name);
-               err = request_firmware(&adev->sdma.instance[i].fw, fw_name, adev->dev);
+               err = amdgpu_ucode_request(adev, &adev->sdma.instance[i].fw, fw_name);
                if (err)
                        goto out;
-               err = amdgpu_ucode_validate(adev->sdma.instance[i].fw);
        }
 out:
        if (err) {
                pr_err("cik_sdma: Failed to load firmware \"%s\"\n", fw_name);
-               for (i = 0; i < adev->sdma.num_instances; i++) {
-                       release_firmware(adev->sdma.instance[i].fw);
-                       adev->sdma.instance[i].fw = NULL;
-               }
+               for (i = 0; i < adev->sdma.num_instances; i++)
+                       amdgpu_ucode_release(&adev->sdma.instance[i].fw);
        }
        return err;
 }