1 files changed, 0 insertions, 105 deletions
diff --git a/common/recipes-kernel/linux/files/0653-drm-amdgpu-remove-amdgpu_fence_ref-unref.patch b/common/recipes-kernel/linux/files/0653-drm-amdgpu-remove-amdgpu_fence_ref-unref.patch
deleted file mode 100644
index 83b4b99e..00000000
--- a/common/recipes-kernel/linux/files/0653-drm-amdgpu-remove-amdgpu_fence_ref-unref.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 6ef68c17d40e1e7e291ca513627a0d2a13ae095f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
-Date: Thu, 22 Oct 2015 15:16:22 +0200
-Subject: [PATCH 0653/1565] drm/amdgpu: remove amdgpu_fence_ref/unref
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Just move the remaining users to fence_put/get.
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu.h       |  3 ---
- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 30 ------------------------------
- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c    |  3 ++-
- drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c |  3 ++-
- 4 files changed, 4 insertions(+), 35 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-index b986ea1..8305a6c 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-@@ -447,9 +447,6 @@ int amdgpu_fence_wait_next(struct amdgpu_ring *ring);
- int amdgpu_fence_wait_empty(struct amdgpu_ring *ring);
- unsigned amdgpu_fence_count_emitted(struct amdgpu_ring *ring);
- 
--struct amdgpu_fence *amdgpu_fence_ref(struct amdgpu_fence *fence);
--void amdgpu_fence_unref(struct amdgpu_fence **fence);
--
- bool amdgpu_fence_need_sync(struct amdgpu_fence *fence,
- 			    struct amdgpu_ring *ring);
- void amdgpu_fence_note_sync(struct amdgpu_fence *fence,
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
-index c4bb282..b912539 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
-@@ -417,36 +417,6 @@ int amdgpu_fence_wait_empty(struct amdgpu_ring *ring)
- }
- 
- /**
-- * amdgpu_fence_ref - take a ref on a fence
-- *
-- * @fence: amdgpu fence object
-- *
-- * Take a reference on a fence (all asics).
-- * Returns the fence.
-- */
--struct amdgpu_fence *amdgpu_fence_ref(struct amdgpu_fence *fence)
--{
--	fence_get(&fence->base);
--	return fence;
--}
--
--/**
-- * amdgpu_fence_unref - remove a ref on a fence
-- *
-- * @fence: amdgpu fence object
-- *
-- * Remove a reference on a fence (all asics).
-- */
--void amdgpu_fence_unref(struct amdgpu_fence **fence)
--{
--	struct amdgpu_fence *tmp = *fence;
--
--	*fence = NULL;
--	if (tmp)
--		fence_put(&tmp->base);
--}
--
--/**
-  * amdgpu_fence_count_emitted - get the count of emitted fences
-  *
-  * @ring: ring the fence is associated with
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
-index aad4c1c..e659877 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
-@@ -95,7 +95,8 @@ void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib)
- {
- 	amdgpu_sync_free(adev, &ib->sync, &ib->fence->base);
- 	amdgpu_sa_bo_free(adev, &ib->sa_bo, &ib->fence->base);
--	amdgpu_fence_unref(&ib->fence);
-+	if (ib->fence)
-+		fence_put(&ib->fence->base);
- }
- 
- /**
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
-index 2e946b2..dcf4a8a 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
-@@ -54,7 +54,8 @@ static struct fence *amdgpu_sched_run_job(struct amd_sched_job *sched_job)
- 		goto err;
- 	}
- 
--	fence = amdgpu_fence_ref(job->ibs[job->num_ibs - 1].fence);
-+	fence = job->ibs[job->num_ibs - 1].fence;
-+	fence_get(&fence->base);
- 
- err:
- 	if (job->free_job)
--- 
-1.9.1
-