Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 446947b4 authored by Wang Hongcheng's avatar Wang Hongcheng Committed by Alex Deucher
Browse files

drm/amdgpu: fix rmmod KCQ disable failed error 



If  gfx_v8_0_hw_fini is called after amdgpu_ucode_fini_bo, we will
hit KCQ disabled failed. Let amdgpu_ucode_fini_bo run after
gfx_v8_0_hw_fini.

BUG: SWDEV-135547
Reviewed-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarWang Hongcheng <Annie.Wang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d5a480b4

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

+3 −0
Original line number Diff line number Diff line
@@ -1836,6 +1836,9 @@ static int amdgpu_fini(struct amdgpu_device *adev) 
		adev->ip_blocks[i].status.hw = false;

	}



	if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU)

		amdgpu_ucode_fini_bo(adev);



	for (i = adev->num_ip_blocks - 1; i >= 0; i--) {

		if (!adev->ip_blocks[i].status.sw)

			continue;

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

+0 −3
Original line number Diff line number Diff line
@@ -164,9 +164,6 @@ static int amdgpu_pp_hw_fini(void *handle) 
		ret = adev->powerplay.ip_funcs->hw_fini(

					adev->powerplay.pp_handle);



	if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU)

		amdgpu_ucode_fini_bo(adev);



	return ret;

}

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

+0 −2
Original line number Diff line number Diff line
@@ -442,8 +442,6 @@ static int psp_hw_fini(void *handle) 
	if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP)

		return 0;



	amdgpu_ucode_fini_bo(adev);



	psp_ring_destroy(psp, PSP_RING_TYPE__KM);



	amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf);