1 files changed, 0 insertions, 75 deletions
diff --git a/common/recipes-kernel/linux/files/0671-drm-amdgpu-use-common-fence-for-amdgpu_vm_fence.patch b/common/recipes-kernel/linux/files/0671-drm-amdgpu-use-common-fence-for-amdgpu_vm_fence.patch
deleted file mode 100644
index bbf31313..00000000
--- a/common/recipes-kernel/linux/files/0671-drm-amdgpu-use-common-fence-for-amdgpu_vm_fence.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 16ae42feb0ce6cc80473d35dd82a1cd07e2e7178 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
-Date: Tue, 3 Nov 2015 14:53:28 +0100
-Subject: [PATCH 0671/1565] drm/amdgpu: use common fence for amdgpu_vm_fence
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Just cleanup the function parameters.
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
-Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu.h    |  2 +-
- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c |  2 +-
- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 12 ++++++------
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-index 3630cb5..b801b67 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-@@ -2332,7 +2332,7 @@ void amdgpu_vm_flush(struct amdgpu_ring *ring,
- 		     struct fence *updates);
- void amdgpu_vm_fence(struct amdgpu_device *adev,
- 		     struct amdgpu_vm *vm,
--		     struct amdgpu_fence *fence);
-+		     struct fence *fence);
- uint64_t amdgpu_vm_map_gart(struct amdgpu_device *adev, uint64_t addr);
- int amdgpu_vm_update_page_directory(struct amdgpu_device *adev,
- 				    struct amdgpu_vm *vm);
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
-index e659877..3902e7a 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
-@@ -216,7 +216,7 @@ int amdgpu_ib_schedule(struct amdgpu_device *adev, unsigned num_ibs,
- 	}
- 
- 	if (ib->vm)
--		amdgpu_vm_fence(adev, ib->vm, ib->fence);
-+		amdgpu_vm_fence(adev, ib->vm, &ib->fence->base);
- 
- 	amdgpu_ring_unlock_commit(ring);
- 	return 0;
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-index 8c80381..a9fcc99 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-@@ -241,16 +241,16 @@ void amdgpu_vm_flush(struct amdgpu_ring *ring,
-  */
- void amdgpu_vm_fence(struct amdgpu_device *adev,
- 		     struct amdgpu_vm *vm,
--		     struct amdgpu_fence *fence)
-+		     struct fence *fence)
- {
--	unsigned ridx = fence->ring->idx;
--	unsigned vm_id = vm->ids[ridx].id;
-+	struct amdgpu_ring *ring = amdgpu_ring_from_fence(fence);
-+	unsigned vm_id = vm->ids[ring->idx].id;
- 
- 	fence_put(adev->vm_manager.active[vm_id]);
--	adev->vm_manager.active[vm_id] = fence_get(&fence->base);
-+	adev->vm_manager.active[vm_id] = fence_get(fence);
- 
--	fence_put(vm->ids[ridx].last_id_use);
--	vm->ids[ridx].last_id_use = fence_get(&fence->base);
-+	fence_put(vm->ids[ring->idx].last_id_use);
-+	vm->ids[ring->idx].last_id_use = fence_get(fence);
- }
- 
- /**
--- 
-1.9.1
-