lkml.org 
[lkml]   [2022]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.17 069/135] drm/amdgpu/ucode: Remove firmware load type check in amdgpu_ucode_free_bo
    Date
    From: Alice Wong <shiwei.wong@amd.com>

    [ Upstream commit ab0cd4a9ae5b4679b714d8dbfedc0901fecdce9f ]

    When psp_hw_init failed, it will set the load_type to AMDGPU_FW_LOAD_DIRECT.
    During amdgpu_device_ip_fini, amdgpu_ucode_free_bo checks that load_type is
    AMDGPU_FW_LOAD_DIRECT and skips deallocating fw_buf causing memory leak.
    Remove load_type check in amdgpu_ucode_free_bo.

    Signed-off-by: Alice Wong <shiwei.wong@amd.com>
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
    index ca3350502618..aebafbc327fb 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
    @@ -714,8 +714,7 @@ int amdgpu_ucode_create_bo(struct amdgpu_device *adev)

    void amdgpu_ucode_free_bo(struct amdgpu_device *adev)
    {
    - if (adev->firmware.load_type != AMDGPU_FW_LOAD_DIRECT)
    - amdgpu_bo_free_kernel(&adev->firmware.fw_buf,
    + amdgpu_bo_free_kernel(&adev->firmware.fw_buf,
    &adev->firmware.fw_buf_mc,
    &adev->firmware.fw_buf_ptr);
    }
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-05-30 15:57    [W:2.931 / U:0.700 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site