blob: 1da60bccdb4efccb00008b697fa2fa80d2a078bc [file] [log] [blame]
From d3a8b771079646c0a161a0e18a6dae6d57b211f8 Mon Sep 17 00:00:00 2001
From: Monk Liu <>
Date: Tue, 17 Dec 2019 18:16:44 +0800
Subject: [PATCH] drm/amdgpu: fix KIQ ring test fail in TDR of SRIOV
commit 5a7489a7e189ee2be889485f90c8cf24ea4b9a40 upstream.
MEC is ruined by the amdkfd_pre_reset after VF FLR done
amdkfd_pre_reset() would ruin MEC after hypervisor finished the VF FLR,
the correct sequence is do amdkfd_pre_reset before VF FLR but there is
a limitation to block this sequence:
if we do pre_reset() before VF FLR, it would go KIQ way to do register
access and stuck there, because KIQ probably won't work by that time
(e.g. you already made GFX hang)
so the best way right now is to simply remove it.
Signed-off-by: Monk Liu <>
Reviewed-by: Emily Deng <>
Signed-off-by: Alex Deucher <>
Signed-off-by: Paul Gortmaker <>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index f4ac632a87b2..5f12205657c7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3238,8 +3238,6 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
if (r)
return r;
- amdgpu_amdkfd_pre_reset(adev);
/* Resume IP prior to SMC */
r = amdgpu_device_ip_reinit_early_sriov(adev);
if (r)