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

Commit b693fc1f authored by Alex Deucher's avatar Alex Deucher
Browse files

Revert "drm/amdgpu: fix rmmod KCQ disable failed error" 



This reverts commit 446947b4.

this patch is incorrrect, amdgpu_ucode_bo_fini always
called after gfx_hw_fini.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent aca31681

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

+0 −3
Original line number Diff line number Diff line
@@ -1837,9 +1837,6 @@ 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

+3 −0
Original line number Diff line number Diff line
@@ -164,6 +164,9 @@ 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

+2 −0
Original line number Diff line number Diff line
@@ -442,6 +442,8 @@ 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);