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 39/45] drm/amd: Use `amdgpu_ucode_*` helpers for VCE
    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/amdgpu_vce.c | 14 +++-----------
    1 file changed, 3 insertions(+), 11 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
    index 02cb3a12dd76..ea78b7513182 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
    @@ -158,19 +158,11 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)
    return -EINVAL;
    }

    - r = request_firmware(&adev->vce.fw, fw_name, adev->dev);
    - if (r) {
    - dev_err(adev->dev, "amdgpu_vce: Can't load firmware \"%s\"\n",
    - fw_name);
    - return r;
    - }
    -
    - r = amdgpu_ucode_validate(adev->vce.fw);
    + r = amdgpu_ucode_request(adev, &adev->vce.fw, fw_name);
    if (r) {
    dev_err(adev->dev, "amdgpu_vce: Can't validate firmware \"%s\"\n",
    fw_name);
    - release_firmware(adev->vce.fw);
    - adev->vce.fw = NULL;
    + amdgpu_ucode_release(&adev->vce.fw);
    return r;
    }

    @@ -226,7 +218,7 @@ int amdgpu_vce_sw_fini(struct amdgpu_device *adev)
    for (i = 0; i < adev->vce.num_rings; i++)
    amdgpu_ring_fini(&adev->vce.ring[i]);

    - release_firmware(adev->vce.fw);
    + amdgpu_ucode_release(&adev->vce.fw);
    mutex_destroy(&adev->vce.idle_mutex);

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