[PATCH v4 18/27] drm/amd: Use `amdgpu_ucode_load` helper for GFX11

[Mario Limonciello]

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

Signed-off-by: Mario Limonciello <mario.limoncie...@amd.com>
---
v3->v4:
 * New patch
---
 drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c 
b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
index a56c6e106d00..0c77d165caf7 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
@@ -457,10 +457,7 @@ static int gfx_v11_0_init_microcode(struct amdgpu_device 
*adev)
        amdgpu_ucode_ip_version_decode(adev, GC_HWIP, ucode_prefix, 
sizeof(ucode_prefix));
 
        snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_pfp.bin", ucode_prefix);
-       err = request_firmware(&adev->gfx.pfp_fw, fw_name, adev->dev);
-       if (err)
-               goto out;
-       err = amdgpu_ucode_validate(adev->gfx.pfp_fw);
+       err = amdgpu_ucode_load(adev, &adev->gfx.pfp_fw, fw_name);
        if (err)
                goto out;
        /* check pfp fw hdr version to decide if enable rs64 for gfx11.*/
@@ -477,10 +474,7 @@ static int gfx_v11_0_init_microcode(struct amdgpu_device 
*adev)
        }
 
        snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_me.bin", ucode_prefix);
-       err = request_firmware(&adev->gfx.me_fw, fw_name, adev->dev);
-       if (err)
-               goto out;
-       err = amdgpu_ucode_validate(adev->gfx.me_fw);
+       err = amdgpu_ucode_load(adev, &adev->gfx.me_fw, fw_name);
        if (err)
                goto out;
        if (adev->gfx.rs64_enable) {
@@ -493,10 +487,7 @@ static int gfx_v11_0_init_microcode(struct amdgpu_device 
*adev)
 
        if (!amdgpu_sriov_vf(adev)) {
                snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_rlc.bin", 
ucode_prefix);
-               err = request_firmware(&adev->gfx.rlc_fw, fw_name, adev->dev);
-               if (err)
-                       goto out;
-               err = amdgpu_ucode_validate(adev->gfx.rlc_fw);
+               err = amdgpu_ucode_load(adev, &adev->gfx.rlc_fw, fw_name);
                if (err)
                        goto out;
                rlc_hdr = (const struct rlc_firmware_header_v2_0 
*)adev->gfx.rlc_fw->data;
@@ -508,10 +499,7 @@ static int gfx_v11_0_init_microcode(struct amdgpu_device 
*adev)
        }
 
        snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec.bin", ucode_prefix);
-       err = request_firmware(&adev->gfx.mec_fw, fw_name, adev->dev);
-       if (err)
-               goto out;
-       err = amdgpu_ucode_validate(adev->gfx.mec_fw);
+       err = amdgpu_ucode_load(adev, &adev->gfx.mec_fw, fw_name);
        if (err)
                goto out;
        if (adev->gfx.rs64_enable) {
@@ -530,9 +518,6 @@ static int gfx_v11_0_init_microcode(struct amdgpu_device 
*adev)
 
 out:
        if (err) {
-               dev_err(adev->dev,
-                       "gfx11: Failed to init firmware \"%s\"\n",
-                       fw_name);
                release_firmware(adev->gfx.pfp_fw);
                adev->gfx.pfp_fw = NULL;
                release_firmware(adev->gfx.me_fw);
-- 
2.34.1