1 files changed, 34 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/1239-drm-amdgpu-tighten-gpu_recover-in-mailbox_flr-to-avo.patch b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/1239-drm-amdgpu-tighten-gpu_recover-in-mailbox_flr-to-avo.patch
new file mode 100644
index 00000000..f472f101
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/1239-drm-amdgpu-tighten-gpu_recover-in-mailbox_flr-to-avo.patch
@@ -0,0 +1,34 @@
+From 69b1c480565b32b6ee1576cc6df4a0486d415f7d Mon Sep 17 00:00:00 2001
+From: wentalou <Wentao.Lou@amd.com>
+Date: Wed, 30 Jan 2019 11:13:01 +0800
+Subject: [PATCH 1239/2940] drm/amdgpu: tighten gpu_recover in mailbox_flr to
+ avoid duplicate recover in sriov
+
+sriov's gpu_recover inside xgpu_ai_mailbox_flr_work would cause duplicate recover in TDR.
+TDR's gpu_recover would be triggered by amdgpu_job_timedout,
+that could avoid vk-cts failure by unexpected recover.
+
+Change-Id: I840dfc145e4e1be9ece6eac8d9f3501da9b28ebf
+Signed-off-by: Wentao Lou <Wentao.Lou@amd.com>
+Acked-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c b/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
+index b11a1c17a7f2..73851ebb3833 100644
+--- a/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
++++ b/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
+@@ -266,7 +266,8 @@ static void xgpu_ai_mailbox_flr_work(struct work_struct *work)
+ 	}
+ 
+ 	/* Trigger recovery for world switch failure if no TDR */
+-	if (amdgpu_device_should_recover_gpu(adev))
++	if (amdgpu_device_should_recover_gpu(adev)
++		&& amdgpu_lockup_timeout == MAX_SCHEDULE_TIMEOUT)
+ 		amdgpu_device_gpu_recover(adev, NULL);
+ }
+ 
+-- 
+2.17.1
+