armbian/linux-rockchip
0
0
Fork 0
mirror of https://github.com/armbian/linux-rockchip.git synced 2026-01-06 11:08:10 -08:00
Code Issues Packages Projects Releases Wiki Activity

drm/amdgpu: Move psp_xgmi_terminate call from amdgpu_xgmi_remove_device to psp_hw_fini

Browse Source 
[ Upstream commit 9d705d7741 ]

V1:
The amdgpu_xgmi_remove_device function will send unload command
to psp through psp ring to terminate xgmi, but psp ring has been
destroyed in psp_hw_fini.

V2:
1. Change the commit title.
2. Restore amdgpu_xgmi_remove_device to its original calling location.
   Move psp_xgmi_terminate call from amdgpu_xgmi_remove_device to
   psp_hw_fini.

Signed-off-by: YiPeng Chai <YiPeng.Chai@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
YiPeng Chai
2022-08-12 13:38:34 +08:00
committed by Greg Kroah-Hartman
parent 67bf86ff81
commit c19656cd95
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
View File

@@ -2146,6 +2146,9 @@ static int psp_hw_fini(void *handle)
psp_rap_terminate(psp); psp_rap_terminate(psp);
psp_dtm_terminate(psp); psp_dtm_terminate(psp);
psp_hdcp_terminate(psp); psp_hdcp_terminate(psp);
if (adev->gmc.xgmi.num_physical_nodes > 1)
psp_xgmi_terminate(psp);
} }
psp_asd_unload(psp); psp_asd_unload(psp);

2
drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
View File

@@ -622,7 +622,7 @@ int amdgpu_xgmi_remove_device(struct amdgpu_device *adev)
amdgpu_put_xgmi_hive(hive); amdgpu_put_xgmi_hive(hive);
} }
return psp_xgmi_terminate(&adev->psp); return 0;
} }
int amdgpu_xgmi_ras_late_init(struct amdgpu_device *adev) int amdgpu_xgmi_ras_late_init(struct amdgpu_device *adev)