lkml.org 
[lkml]   [2023]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 33/45] drm/amd: Use `amdgpu_ucode_*` helpers for GMC7
    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.

    Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
    ---
    drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 13 +++----------
    1 file changed, 3 insertions(+), 10 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
    index 979da6f510e8..934410701a15 100644
    --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
    @@ -156,16 +156,10 @@ static int gmc_v7_0_init_microcode(struct amdgpu_device *adev)

    snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name);

    - err = request_firmware(&adev->gmc.fw, fw_name, adev->dev);
    - if (err)
    - goto out;
    - err = amdgpu_ucode_validate(adev->gmc.fw);
    -
    -out:
    + err = amdgpu_ucode_request(adev, &adev->gmc.fw, fw_name);
    if (err) {
    pr_err("cik_mc: Failed to load firmware \"%s\"\n", fw_name);
    - release_firmware(adev->gmc.fw);
    - adev->gmc.fw = NULL;
    + amdgpu_ucode_release(adev->gmc.fw);
    }
    return err;
    }
    @@ -1081,8 +1075,7 @@ static int gmc_v7_0_sw_fini(void *handle)
    kfree(adev->gmc.vm_fault_info);
    amdgpu_gart_table_vram_free(adev);
    amdgpu_bo_fini(adev);
    - release_firmware(adev->gmc.fw);
    - adev->gmc.fw = NULL;
    + amdgpu_ucode_release(adev->gmc.fw);

    return 0;
    }
    --
    2.34.1
    \
     
     \ /
      Last update: 2023-03-26 23:27    [W:2.265 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site