drm/amd: Use `amdgpu_ucode_*` helpers for GFX8

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/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 70bb42c..4fb577d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -924,20 +924,14 @@ err1:
 
 static void gfx_v8_0_free_microcode(struct amdgpu_device *adev)
 {
-       release_firmware(adev->gfx.pfp_fw);
-       adev->gfx.pfp_fw = NULL;
-       release_firmware(adev->gfx.me_fw);
-       adev->gfx.me_fw = NULL;
-       release_firmware(adev->gfx.ce_fw);
-       adev->gfx.ce_fw = NULL;
-       release_firmware(adev->gfx.rlc_fw);
-       adev->gfx.rlc_fw = NULL;
-       release_firmware(adev->gfx.mec_fw);
-       adev->gfx.mec_fw = NULL;
+       amdgpu_ucode_release(&adev->gfx.pfp_fw);
+       amdgpu_ucode_release(&adev->gfx.me_fw);
+       amdgpu_ucode_release(&adev->gfx.ce_fw);
+       amdgpu_ucode_release(&adev->gfx.rlc_fw);
+       amdgpu_ucode_release(&adev->gfx.mec_fw);
        if ((adev->asic_type != CHIP_STONEY) &&
            (adev->asic_type != CHIP_TOPAZ))
-               release_firmware(adev->gfx.mec2_fw);
-       adev->gfx.mec2_fw = NULL;
+               amdgpu_ucode_release(&adev->gfx.mec2_fw);
 
        kfree(adev->gfx.rlc.register_list_format);
 }
@@ -989,18 +983,15 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev)
 
        if (adev->asic_type >= CHIP_POLARIS10 && adev->asic_type <= CHIP_POLARIS12) {
                snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_pfp_2.bin", chip_name);
-               err = request_firmware(&adev->gfx.pfp_fw, fw_name, adev->dev);
-               if (err == -ENOENT) {
+               err = amdgpu_ucode_request(adev, &adev->gfx.pfp_fw, fw_name);
+               if (err == -ENODEV) {
                        snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_pfp.bin", chip_name);
-                       err = request_firmware(&adev->gfx.pfp_fw, fw_name, adev->dev);
+                       err = amdgpu_ucode_request(adev, &adev->gfx.pfp_fw, fw_name);
                }
        } else {
                snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_pfp.bin", chip_name);
-               err = request_firmware(&adev->gfx.pfp_fw, fw_name, adev->dev);
+               err = amdgpu_ucode_request(adev, &adev->gfx.pfp_fw, fw_name);
        }
-       if (err)
-               goto out;
-       err = amdgpu_ucode_validate(adev->gfx.pfp_fw);
        if (err)
                goto out;
        cp_hdr = (const struct gfx_firmware_header_v1_0 *)adev->gfx.pfp_fw->data;
@@ -1009,18 +1000,15 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev)
 
        if (adev->asic_type >= CHIP_POLARIS10 && adev->asic_type <= CHIP_POLARIS12) {
                snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_me_2.bin", chip_name);
-               err = request_firmware(&adev->gfx.me_fw, fw_name, adev->dev);
-               if (err == -ENOENT) {
+               err = amdgpu_ucode_request(adev, &adev->gfx.me_fw, fw_name);
+               if (err == -ENODEV) {
                        snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_me.bin", chip_name);
-                       err = request_firmware(&adev->gfx.me_fw, fw_name, adev->dev);
+               err = amdgpu_ucode_request(adev, &adev->gfx.me_fw, fw_name);
                }
        } else {
                snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_me.bin", chip_name);
-               err = request_firmware(&adev->gfx.me_fw, fw_name, adev->dev);
+               err = amdgpu_ucode_request(adev, &adev->gfx.me_fw, fw_name);
        }
-       if (err)
-               goto out;
-       err = amdgpu_ucode_validate(adev->gfx.me_fw);
        if (err)
                goto out;
        cp_hdr = (const struct gfx_firmware_header_v1_0 *)adev->gfx.me_fw->data;
@@ -1030,18 +1018,15 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev)
 
        if (adev->asic_type >= CHIP_POLARIS10 && adev->asic_type <= CHIP_POLARIS12) {
                snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ce_2.bin", chip_name);
-               err = request_firmware(&adev->gfx.ce_fw, fw_name, adev->dev);
-               if (err == -ENOENT) {
+               err = amdgpu_ucode_request(adev, &adev->gfx.ce_fw, fw_name);
+               if (err == -ENODEV) {
                        snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ce.bin", chip_name);
-                       err = request_firmware(&adev->gfx.ce_fw, fw_name, adev->dev);
+                       err = amdgpu_ucode_request(adev, &adev->gfx.ce_fw, fw_name);
                }
        } else {
                snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ce.bin", chip_name);
-               err = request_firmware(&adev->gfx.ce_fw, fw_name, adev->dev);
+               err = amdgpu_ucode_request(adev, &adev->gfx.ce_fw, fw_name);
        }
-       if (err)
-               goto out;
-       err = amdgpu_ucode_validate(adev->gfx.ce_fw);
        if (err)
                goto out;
        cp_hdr = (const struct gfx_firmware_header_v1_0 *)adev->gfx.ce_fw->data;
@@ -1060,10 +1045,9 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev)
                adev->virt.chained_ib_support = false;
 
        snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_rlc.bin", chip_name);
-       err = request_firmware(&adev->gfx.rlc_fw, fw_name, adev->dev);
+       err = amdgpu_ucode_request(adev, &adev->gfx.rlc_fw, fw_name);
        if (err)
                goto out;
-       err = amdgpu_ucode_validate(adev->gfx.rlc_fw);
        rlc_hdr = (const struct rlc_firmware_header_v2_0 *)adev->gfx.rlc_fw->data;
        adev->gfx.rlc_fw_version = le32_to_cpu(rlc_hdr->header.ucode_version);
        adev->gfx.rlc_feature_version = le32_to_cpu(rlc_hdr->ucode_feature_version);
@@ -1110,18 +1094,15 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev)
 
        if (adev->asic_type >= CHIP_POLARIS10 && adev->asic_type <= CHIP_POLARIS12) {
                snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec_2.bin", chip_name);
-               err = request_firmware(&adev->gfx.mec_fw, fw_name, adev->dev);
-               if (err == -ENOENT) {
+               err = amdgpu_ucode_request(adev, &adev->gfx.mec_fw, fw_name);
+               if (err == -ENODEV) {
                        snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec.bin", chip_name);
-                       err = request_firmware(&adev->gfx.mec_fw, fw_name, adev->dev);
+                       err = amdgpu_ucode_request(adev, &adev->gfx.mec_fw, fw_name);
                }
        } else {
                snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec.bin", chip_name);
-               err = request_firmware(&adev->gfx.mec_fw, fw_name, adev->dev);
+               err = amdgpu_ucode_request(adev, &adev->gfx.mec_fw, fw_name);
        }
-       if (err)
-               goto out;
-       err = amdgpu_ucode_validate(adev->gfx.mec_fw);
        if (err)
                goto out;
        cp_hdr = (const struct gfx_firmware_header_v1_0 *)adev->gfx.mec_fw->data;
@@ -1132,19 +1113,16 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev)
            (adev->asic_type != CHIP_TOPAZ)) {
                if (adev->asic_type >= CHIP_POLARIS10 && adev->asic_type <= CHIP_POLARIS12) {
                        snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec2_2.bin", chip_name);
-                       err = request_firmware(&adev->gfx.mec2_fw, fw_name, adev->dev);
-                       if (err == -ENOENT) {
+                       err = amdgpu_ucode_request(adev, &adev->gfx.mec2_fw, fw_name);
+                       if (err == -ENODEV) {
                                snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec2.bin", chip_name);
-                               err = request_firmware(&adev->gfx.mec2_fw, fw_name, adev->dev);
+                               err = amdgpu_ucode_request(adev, &adev->gfx.mec2_fw, fw_name);
                        }
                } else {
                        snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec2.bin", chip_name);
-                       err = request_firmware(&adev->gfx.mec2_fw, fw_name, adev->dev);
+                       err = amdgpu_ucode_request(adev, &adev->gfx.mec2_fw, fw_name);
                }
                if (!err) {
-                       err = amdgpu_ucode_validate(adev->gfx.mec2_fw);
-                       if (err)
-                               goto out;
                        cp_hdr = (const struct gfx_firmware_header_v1_0 *)
                                adev->gfx.mec2_fw->data;
                        adev->gfx.mec2_fw_version =
@@ -1219,18 +1197,12 @@ out:
                dev_err(adev->dev,
                        "gfx8: Failed to load firmware \"%s\"\n",
                        fw_name);
-               release_firmware(adev->gfx.pfp_fw);
-               adev->gfx.pfp_fw = NULL;
-               release_firmware(adev->gfx.me_fw);
-               adev->gfx.me_fw = NULL;
-               release_firmware(adev->gfx.ce_fw);
-               adev->gfx.ce_fw = NULL;
-               release_firmware(adev->gfx.rlc_fw);
-               adev->gfx.rlc_fw = NULL;
-               release_firmware(adev->gfx.mec_fw);
-               adev->gfx.mec_fw = NULL;
-               release_firmware(adev->gfx.mec2_fw);
-               adev->gfx.mec2_fw = NULL;
+               amdgpu_ucode_release(&adev->gfx.pfp_fw);
+               amdgpu_ucode_release(&adev->gfx.me_fw);
+               amdgpu_ucode_release(&adev->gfx.ce_fw);
+               amdgpu_ucode_release(&adev->gfx.rlc_fw);
+               amdgpu_ucode_release(&adev->gfx.mec_fw);
+               amdgpu_ucode_release(&adev->gfx.mec2_fw);
        }
        return err;
 }