[PATCH] drm/amdgpu/ucode: Remove firmware load type check in amdgpu_ucode_free_bo

Alex Deucher alexdeucher at gmail.com
Fri Apr 29 20:38:40 UTC 2022


On Fri, Apr 29, 2022 at 4:16 PM Alice Wong <shiwei.wong at amd.com> wrote:
>
> 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 at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  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.25.1
>


More information about the amd-gfx mailing list