1 files changed, 94 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3314-drm-amdgpu-reset-kfd-during-amdgpu-reset.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3314-drm-amdgpu-reset-kfd-during-amdgpu-reset.patch
new file mode 100644
index 00000000..4e6a874e
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3314-drm-amdgpu-reset-kfd-during-amdgpu-reset.patch
@@ -0,0 +1,94 @@
+From 3adfe6c5742a7c4400452d66a28043b3e13aaa89 Mon Sep 17 00:00:00 2001
+From: Shaoyun Liu <Shaoyun.Liu@amd.com>
+Date: Fri, 26 Jan 2018 12:16:57 -0500
+Subject: [PATCH 3314/4131] drm/amdgpu: reset kfd during amdgpu reset
+
+Change-Id: Id5310a2043bac7d907b1a9102743313132a11e1d
+Signed-off-by: Shaoyun Liu <Shaoyun.Liu@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 27 +++++++++++++++++++++++++++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h |  6 ++++++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |  5 +++++
+ 3 files changed, 38 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+index f367044..930869f 100755
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+@@ -248,6 +248,33 @@ int amdgpu_amdkfd_resume(struct amdgpu_device *adev)
+ 	return r;
+ }
+ 
++int amdgpu_amdkfd_pre_reset(struct amdgpu_device *adev)
++{
++	int r = 0;
++
++	if (adev->kfd)
++		r = kgd2kfd->pre_reset(adev->kfd);
++
++	return r;
++}
++
++int amdgpu_amdkfd_post_reset(struct amdgpu_device *adev)
++{
++	int r = 0;
++
++	if (adev->kfd)
++		r = kgd2kfd->post_reset(adev->kfd);
++
++	return r;
++}
++
++void amdgpu_amdkfd_gpu_reset(struct kgd_dev *kgd)
++{
++	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
++
++	amdgpu_device_gpu_recover(adev, NULL, false);
++}
++
+ int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd, enum kgd_engine_type engine,
+ 				uint32_t vmid, uint64_t gpu_addr,
+ 				uint32_t *ib_cmd, uint32_t ib_len)
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
+index be9b009..f1b4557 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
+@@ -158,6 +158,12 @@ int amdgpu_amdkfd_copy_mem_to_mem(struct kgd_dev *kgd, struct kgd_mem *src_mem,
+ bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev,
+ 			u32 vmid);
+ 
++int amdgpu_amdkfd_pre_reset(struct amdgpu_device *adev);
++
++int amdgpu_amdkfd_post_reset(struct amdgpu_device *adev);
++
++void amdgpu_amdkfd_gpu_reset(struct kgd_dev *kgd);
++
+ /* Shared API */
+ int map_bo(struct amdgpu_device *rdev, uint64_t va, void *vm,
+ 		struct amdgpu_bo *bo, struct amdgpu_bo_va **bo_va);
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+index 0f7e5ad..e9a8561 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+@@ -2668,6 +2668,9 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
+ 	mutex_lock(&adev->lock_reset);
+         atomic_inc(&adev->gpu_reset_counter);
+ 	adev->in_gpu_reset = 1;
++	
++	/* Block kfd */
++	amdgpu_amdkfd_pre_reset(adev);
+ 
+         /* block TTM */
+         resched = ttm_bo_lock_delayed_workqueue(&adev->mman.bdev);
+@@ -2774,6 +2777,8 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
+                 amdgpu_vf_error_put(adev, AMDGIM_ERROR_VF_GPU_RESET_FAIL, 0, r);
+         } else {
+                 dev_info(adev->dev, "GPU reset(%d) successed!\n",atomic_read(&adev->gpu_reset_counter));
++		/*unlock kfd after a successfully recovery*/
++		amdgpu_amdkfd_post_reset(adev);
+         }
+ 
+         amdgpu_vf_error_trans_all(adev);
+-- 
+2.7.4
+