1 files changed, 33 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/1118-drm-amdgpu-sriov-should-skip-asic_reset-in-device_in.patch b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/1118-drm-amdgpu-sriov-should-skip-asic_reset-in-device_in.patch
new file mode 100644
index 00000000..d880629e
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/1118-drm-amdgpu-sriov-should-skip-asic_reset-in-device_in.patch
@@ -0,0 +1,33 @@
+From daa51f55b2c0a5e363a437b78e9e22ab308ea5b8 Mon Sep 17 00:00:00 2001
+From: wentalou <Wentao.Lou@amd.com>
+Date: Thu, 17 Jan 2019 17:38:33 +0800
+Subject: [PATCH 1118/2940] drm/amdgpu: sriov should skip asic_reset in
+ device_init
+
+sriov would meet guest driver load failure,
+if calling amdgpu_asic_reset in amdgpu_device_init.
+sriov should skip asic_reset in device_init.
+
+Signed-off-by: Wentao Lou <Wentao.Lou@amd.com>
+Acked-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+index 2d04830daba1..e8fe0d0ce3ce 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+@@ -2602,7 +2602,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,
+ 	/* check if we need to reset the asic
+ 	 *  E.g., driver was not cleanly unloaded previously, etc.
+ 	 */
+-	if (amdgpu_asic_need_reset_on_init(adev)) {
++	if (!amdgpu_sriov_vf(adev) && amdgpu_asic_need_reset_on_init(adev)) {
+ 		r = amdgpu_asic_reset(adev);
+ 		if (r) {
+ 			dev_err(adev->dev, "asic reset on init failed\n");
+-- 
+2.17.1
+