[PATCH v6 35/45] drm/amd: Use `amdgpu_ucode_*` helpers for SDMA2.4

[Mario Limonciello]

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.deuc...@amd.com>
Signed-off-by: Mario Limonciello <mario.limoncie...@amd.com>
---
v5->v6:
 * Adjust for amdgpu_ucode_release argument change
---
 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c 
b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
index c52d246a1d96..fd2a7b66ac56 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
@@ -113,10 +113,9 @@ static void sdma_v2_4_init_golden_registers(struct 
amdgpu_device *adev)
 static void sdma_v2_4_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);
 }
 
 /**
@@ -151,10 +150,7 @@ static int sdma_v2_4_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);
-               if (err)
-                       goto out;
-               err = amdgpu_ucode_validate(adev->sdma.instance[i].fw);
+               err = amdgpu_ucode_request(adev, &adev->sdma.instance[i].fw, 
fw_name);
                if (err)
                        goto out;
                hdr = (const struct sdma_firmware_header_v1_0 
*)adev->sdma.instance[i].fw->data;
@@ -176,10 +172,8 @@ static int sdma_v2_4_init_microcode(struct amdgpu_device 
*adev)
 out:
        if (err) {
                pr_err("sdma_v2_4: 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;
 }
-- 
2.34.1