[AMD Official Use Only - General] Reviewed-by: Zhigang Luo <zhigang.luo@xxxxxxx> -----Original Message----- From: Skvortsov, Victor <Victor.Skvortsov@xxxxxxx> Sent: Tuesday, March 12, 2024 10:09 PM To: Skvortsov, Victor <Victor.Skvortsov@xxxxxxx>; Chai, Thomas <YiPeng.Chai@xxxxxxx>; Zhang, Hawking <Hawking.Zhang@xxxxxxx>; Luo, Zhigang <Zhigang.Luo@xxxxxxx>; amd-gfx@xxxxxxxxxxxxxxxxxxxxx Cc: Skvortsov, Victor <Victor.Skvortsov@xxxxxxx> Subject: [PATCH] drm/amdgpu: Skip virt_exchange_init on SDMA poison consumption From: Victor Skvortsov <Victor.Skvortsov@xxxxxxx> Host will initiate an FLR in SDMA poison consumption scenario. Guest should wait for FLR message to re-init data exchange. Signed-off-by: Victor Skvortsov <Victor.Skvortsov@xxxxxxx> --- drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c b/drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c index 77f5b55decf9..a1bad772d932 100644 --- a/drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c +++ b/drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c @@ -444,7 +444,8 @@ static void xgpu_nv_ras_poison_handler(struct amdgpu_device *adev, amdgpu_virt_fini_data_exchange(adev); xgpu_nv_send_access_requests_with_param(adev, IDH_RAS_POISON, block, 0, 0); - amdgpu_virt_init_data_exchange(adev); + if (block != AMDGPU_RAS_BLOCK__SDMA) + amdgpu_virt_init_data_exchange(adev); } } -- 2.25.1