Commit c01aebee authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd: Fix an error handling mistake in psp_sw_init() 



If the second call to amdgpu_bo_create_kernel() fails, the memory
allocated from the first call should be cleared.  If the third call
fails, the memory from the second call should be cleared.

Fixes: b95b5391 ("drm/amdgpu/psp: move PSP memory alloc from hw_init to sw_init")
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9beb223f

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

+3 −3
Original line number Diff line number Diff line
@@ -498,11 +498,11 @@ static int psp_sw_init(void *handle) 
	return 0;



failed2:

	amdgpu_bo_free_kernel(&psp->fw_pri_bo,

			      &psp->fw_pri_mc_addr, &psp->fw_pri_buf);

failed1:

	amdgpu_bo_free_kernel(&psp->fence_buf_bo,

			      &psp->fence_buf_mc_addr, &psp->fence_buf);

failed1:

	amdgpu_bo_free_kernel(&psp->fw_pri_bo,

			      &psp->fw_pri_mc_addr, &psp->fw_pri_buf);

	return ret;

}