drm/amdgpu/ucode: Remove firmware load type check in amdgpu_ucode_free_bo
authorAlice Wong <shiwei.wong@amd.com>
Mon, 2 May 2022 15:40:18 +0000 (11:40 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jun 2022 08:22:35 +0000 (10:22 +0200)
[ 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

index abd8469380e512cf87f3670d04ab3c99b46dc634..0ed0736d515aac6324f4efb9e9bc8205d01bb55f 100644 (file)
@@ -723,8 +723,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);
 }