drm/amdgpu:disable XGMI TA unload for A+A aldebaran
authorFeifei Xu <Feifei.Xu@amd.com>
Wed, 10 Mar 2021 14:04:32 +0000 (22:04 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 24 Mar 2021 03:27:36 +0000 (23:27 -0400)
In gpu reset, XGMI TA unload will cause gpu hang.
Skip it on A+A aldebaran.

Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

index 80a4dc51951e1f5e678db0ec1814e4e556c5f4e0..bae304b0d67a17a00ccec21965b603f75475d3ee 100644 (file)
@@ -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;
 
        /*