drm/amd: Use `amdgpu_ucode_request` helper for SDMA

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

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/amdgpu_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
index ea5278f094c0814b7519124ef8578b8e901fc57e..a6a491569022b291b546a9e6d5208c5f1222e29c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
@@ -154,16 +154,11 @@ int amdgpu_sdma_process_ecc_irq(struct amdgpu_device *adev,
 
 static int amdgpu_sdma_init_inst_ctx(struct amdgpu_sdma_instance *sdma_inst)
 {
-       int err = 0;
        uint16_t version_major;
        const struct common_firmware_header *header = NULL;
        const struct sdma_firmware_header_v1_0 *hdr;
        const struct sdma_firmware_header_v2_0 *hdr_v2;
 
-       err = amdgpu_ucode_validate(sdma_inst->fw);
-       if (err)
-               return err;
-
        header = (const struct common_firmware_header *)
                sdma_inst->fw->data;
        version_major = le16_to_cpu(header->header_version_major);
@@ -195,7 +190,7 @@ void amdgpu_sdma_destroy_inst_ctx(struct amdgpu_device *adev,
        int i;
 
        for (i = 0; i < adev->sdma.num_instances; i++) {
-               release_firmware(adev->sdma.instance[i].fw);
+               amdgpu_ucode_release(&adev->sdma.instance[i].fw);
                if (duplicate)
                        break;
        }
@@ -214,7 +209,7 @@ int amdgpu_sdma_init_microcode(struct amdgpu_device *adev,
        const struct sdma_firmware_header_v2_0 *sdma_hdr;
        uint16_t version_major;
 
-       err = request_firmware(&adev->sdma.instance[instance].fw, fw_name, adev->dev);
+       err = amdgpu_ucode_request(adev, &adev->sdma.instance[instance].fw, fw_name);
        if (err)
                goto out;