Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

This reverts commit 446947b44fb8cabc0213ff4efd706931e36b1963.

this patch is incorrrect, amdgpu_ucode_bo_fini always
called after gfx_hw_fini.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

+5 -3
-3
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
··· 1837 1837 adev->ip_blocks[i].status.hw = false; 1838 1838 } 1839 1839 1840 - if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU) 1841 - amdgpu_ucode_fini_bo(adev); 1842 - 1843 1840 for (i = adev->num_ip_blocks - 1; i >= 0; i--) { 1844 1841 if (!adev->ip_blocks[i].status.sw) 1845 1842 continue;
+3
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
··· 164 164 ret = adev->powerplay.ip_funcs->hw_fini( 165 165 adev->powerplay.pp_handle); 166 166 167 + if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU) 168 + amdgpu_ucode_fini_bo(adev); 169 + 167 170 return ret; 168 171 } 169 172
+2
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
··· 442 442 if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) 443 443 return 0; 444 444 445 + amdgpu_ucode_fini_bo(adev); 446 + 445 447 psp_ring_destroy(psp, PSP_RING_TYPE__KM); 446 448 447 449 amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf);