lkml.org 
[lkml]   [2023]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v7 29/45] drm/amd: Use `amdgpu_ucode_*` helpers for GFX6
    Date
    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>
    ---
    v5->v6:
    * Adjust for amdgpu_ucode_release argument change
    ---
    drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 30 +++++++--------------------
    1 file changed, 8 insertions(+), 22 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
    index 204b246f0e3f..438eab348fc8 100644
    --- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
    @@ -338,10 +338,7 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev)
    }

    snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_pfp.bin", chip_name);
    - 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_request(adev, &adev->gfx.pfp_fw, fw_name);
    if (err)
    goto out;
    cp_hdr = (const struct gfx_firmware_header_v1_0 *)adev->gfx.pfp_fw->data;
    @@ -349,10 +346,7 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev)
    adev->gfx.pfp_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version);

    snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_me.bin", chip_name);
    - 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_request(adev, &adev->gfx.me_fw, fw_name);
    if (err)
    goto out;
    cp_hdr = (const struct gfx_firmware_header_v1_0 *)adev->gfx.me_fw->data;
    @@ -360,10 +354,7 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev)
    adev->gfx.me_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version);

    snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ce.bin", chip_name);
    - err = request_firmware(&adev->gfx.ce_fw, fw_name, adev->dev);
    - if (err)
    - goto out;
    - err = amdgpu_ucode_validate(adev->gfx.ce_fw);
    + err = amdgpu_ucode_request(adev, &adev->gfx.ce_fw, fw_name);
    if (err)
    goto out;
    cp_hdr = (const struct gfx_firmware_header_v1_0 *)adev->gfx.ce_fw->data;
    @@ -371,10 +362,9 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev)
    adev->gfx.ce_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version);

    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_v1_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);
    @@ -382,14 +372,10 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev)
    out:
    if (err) {
    pr_err("gfx6: 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;
    + 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);
    }
    return err;
    }
    --
    2.34.1
    \
     
     \ /
      Last update: 2023-03-26 23:28    [W:4.649 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site