lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRE: [PATCH 5.10 065/452] drm/amdgpu/ucode: Remove firmware load type check in amdgpu_ucode_free_bo
    Date
    [Public]

    > -----Original Message-----
    > From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    > Sent: Tuesday, June 7, 2022 12:59 PM
    > To: linux-kernel@vger.kernel.org
    > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>;
    > stable@vger.kernel.org; Wong, Alice <Shiwei.Wong@amd.com>; Deucher,
    > Alexander <Alexander.Deucher@amd.com>; Sasha Levin
    > <sashal@kernel.org>
    > Subject: [PATCH 5.10 065/452] drm/amdgpu/ucode: Remove firmware load
    > type check in amdgpu_ucode_free_bo
    >
    > 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>


    I don't think this patch is relevant for kernels older than 5.19. I shouldn't hurt anything however.

    Alex

    > ---
    > 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 b313ce4c3e97..30005ed8156f 100644
    > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
    > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
    > @@ -625,8 +625,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-06-07 20:00    [W:4.083 / U:0.304 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site