1 files changed, 0 insertions, 73 deletions
diff --git a/common/recipes-kernel/linux/files/0229-drm-amdgpu-sync-fence-of-clear_invalids-v2.patch b/common/recipes-kernel/linux/files/0229-drm-amdgpu-sync-fence-of-clear_invalids-v2.patch
deleted file mode 100644
index 06716929..00000000
--- a/common/recipes-kernel/linux/files/0229-drm-amdgpu-sync-fence-of-clear_invalids-v2.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From cfe2c9780756b63af695078c110b755876b09dfc Mon Sep 17 00:00:00 2001
-From: "monk.liu" <monk.liu@amd.com>
-Date: Tue, 26 May 2015 15:01:54 +0800
-Subject: [PATCH 0229/1050] drm/amdgpu: sync fence of clear_invalids (v2)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-bo_va may un-initialized, fix it.
-
-Signed-off-by: monk.liu <monk.liu@amd.com>
-Reviewed-by: Christian König <christian.koenig@amd.com>
-Reviewed-by: Jammy Zhou <jammy.zhou@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu.h    | 2 +-
- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +-
- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 ++++--
- 3 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-index 8eb5c55..6c8c24b 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-@@ -2268,7 +2268,7 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev,
- int amdgpu_vm_clear_freed(struct amdgpu_device *adev,
- 				struct amdgpu_vm *vm);
- int amdgpu_vm_clear_invalids(struct amdgpu_device *adev,
--				struct amdgpu_vm *vm);
-+				struct amdgpu_vm *vm, struct amdgpu_sync *sync);
- int amdgpu_vm_bo_update(struct amdgpu_device *adev,
- 			struct amdgpu_bo_va *bo_va,
- 			struct ttm_mem_reg *mem);
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-index ecb30a1..fefa48a 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-@@ -520,7 +520,7 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p,
- 
- 		amdgpu_sync_fence(&p->ibs[0].sync, bo_va->last_pt_update);
- 	}
--	return amdgpu_vm_clear_invalids(adev, vm);
-+	return amdgpu_vm_clear_invalids(adev, vm, &p->ibs[0].sync);
- }
- 
- static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev,
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-index dcb2d38..4d26b30 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-@@ -858,9 +858,9 @@ int amdgpu_vm_clear_freed(struct amdgpu_device *adev,
-  * PTs have to be reserved and mutex must be locked!
-  */
- int amdgpu_vm_clear_invalids(struct amdgpu_device *adev,
--			     struct amdgpu_vm *vm)
-+			     struct amdgpu_vm *vm, struct amdgpu_sync *sync)
- {
--	struct amdgpu_bo_va *bo_va;
-+	struct amdgpu_bo_va *bo_va = NULL;
- 	int r;
- 
- 	spin_lock(&vm->status_lock);
-@@ -877,6 +877,8 @@ int amdgpu_vm_clear_invalids(struct amdgpu_device *adev,
- 	}
- 	spin_unlock(&vm->status_lock);
- 
-+	if (bo_va)
-+		amdgpu_sync_fence(sync, bo_va->last_pt_update);
- 	return 0;
- }
- 
--- 
-1.9.1
-