From: Feifei Xu Date: Wed, 10 Mar 2021 14:04:32 +0000 (+0800) Subject: drm/amdgpu:disable XGMI TA unload for A+A aldebaran X-Git-Tag: io_uring-5.13-2021-05-07~38^2~12^2~77 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=99d1da6774e11881be5416846f09ed5057ebae42;p=linux-block.git drm/amdgpu:disable XGMI TA unload for A+A aldebaran In gpu reset, XGMI TA unload will cause gpu hang. Skip it on A+A aldebaran. Signed-off-by: Feifei Xu Reviewed-by: Lijo Lazar Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index 80a4dc51951e..bae304b0d67a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -791,8 +791,9 @@ static int psp_xgmi_unload(struct psp_context *psp) struct psp_gfx_cmd_resp *cmd; struct amdgpu_device *adev = psp->adev; - /* XGMI TA unload currently is not supported on Arcturus */ - if (adev->asic_type == CHIP_ARCTURUS) + /* XGMI TA unload currently is not supported on Arcturus/Aldebaran A+A */ + if (adev->asic_type == CHIP_ARCTURUS || + (adev->asic_type == CHIP_ALDEBARAN && adev->gmc.xgmi.connected_to_cpu)) return 0; /*