1 files changed, 0 insertions, 92 deletions
diff --git a/common/recipes-kernel/linux/files/0414-drm-amdgpu-use-kernel-fence-diretly-in-amdgpu_bo_fen.patch b/common/recipes-kernel/linux/files/0414-drm-amdgpu-use-kernel-fence-diretly-in-amdgpu_bo_fen.patch
deleted file mode 100644
index dabb3af5..00000000
--- a/common/recipes-kernel/linux/files/0414-drm-amdgpu-use-kernel-fence-diretly-in-amdgpu_bo_fen.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From e40a31159b72742224c249cf57c5313be7ccd629 Mon Sep 17 00:00:00 2001
-From: Chunming Zhou <david1.zhou@amd.com>
-Date: Mon, 3 Aug 2015 11:38:09 +0800
-Subject: [PATCH 0414/1050] drm/amdgpu: use kernel fence diretly in
- amdgpu_bo_fence
-
-Signed-off-by: Chunming Zhou <david1.zhou@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_object.c | 6 +++---
- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +-
- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c     | 8 ++++----
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
-index 6c63a2c..87d67f8 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
-@@ -658,13 +658,13 @@ int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo)
-  * @shared: true if fence should be added shared
-  *
-  */
--void amdgpu_bo_fence(struct amdgpu_bo *bo, struct amdgpu_fence *fence,
-+void amdgpu_bo_fence(struct amdgpu_bo *bo, struct fence *fence,
- 		     bool shared)
- {
- 	struct reservation_object *resv = bo->tbo.resv;
- 
- 	if (shared)
--		reservation_object_add_shared_fence(resv, &fence->base);
-+		reservation_object_add_shared_fence(resv, fence);
- 	else
--		reservation_object_add_excl_fence(resv, &fence->base);
-+		reservation_object_add_excl_fence(resv, fence);
- }
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
-index 675bdc3..238465a 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
-@@ -161,7 +161,7 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer,
- void amdgpu_bo_move_notify(struct ttm_buffer_object *bo,
- 				  struct ttm_mem_reg *new_mem);
- int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo);
--void amdgpu_bo_fence(struct amdgpu_bo *bo, struct amdgpu_fence *fence,
-+void amdgpu_bo_fence(struct amdgpu_bo *bo, struct fence *fence,
- 		     bool shared);
- 
- /*
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-index f216632..8745d4c 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-@@ -320,7 +320,7 @@ static int amdgpu_vm_run_job(
- 	struct amdgpu_cs_parser *sched_job)
- {
- 	amdgpu_bo_fence(sched_job->job_param.vm.bo,
--			sched_job->ibs[sched_job->num_ibs -1].fence, true);
-+			&sched_job->ibs[sched_job->num_ibs -1].fence->base, true);
- 	return 0;
- }
- 
-@@ -397,7 +397,7 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
- 		r = amdgpu_ib_schedule(adev, 1, ib, AMDGPU_FENCE_OWNER_VM);
- 		if (r)
- 			goto error_free;
--		amdgpu_bo_fence(bo, ib->fence, true);
-+		amdgpu_bo_fence(bo, &ib->fence->base, true);
- 	}
- 
- error_free:
-@@ -547,7 +547,7 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev,
- 				amdgpu_ib_free(adev, ib);
- 				return r;
- 			}
--			amdgpu_bo_fence(pd, ib->fence, true);
-+			amdgpu_bo_fence(pd, &ib->fence->base, true);
- 		}
- 	}
- 
-@@ -745,7 +745,7 @@ static void amdgpu_vm_fence_pts(struct amdgpu_vm *vm,
- 	end >>= amdgpu_vm_block_size;
- 
- 	for (i = start; i <= end; ++i)
--		amdgpu_bo_fence(vm->page_tables[i].bo, fence, true);
-+		amdgpu_bo_fence(vm->page_tables[i].bo, &fence->base, true);
- }
- 
- static int amdgpu_vm_bo_update_mapping_run_job(
--- 
-1.9.1
-