1 files changed, 0 insertions, 79 deletions
diff --git a/common/recipes-kernel/linux/files/0626-drm-amdgpu-remove-the-unnecessary-parameter-adev-for.patch b/common/recipes-kernel/linux/files/0626-drm-amdgpu-remove-the-unnecessary-parameter-adev-for.patch
deleted file mode 100644
index bf34756a..00000000
--- a/common/recipes-kernel/linux/files/0626-drm-amdgpu-remove-the-unnecessary-parameter-adev-for.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From ce16b0e5a32a157abd6446214e8b91c55064204e Mon Sep 17 00:00:00 2001
-From: Junwei Zhang <Jerry.Zhang@amd.com>
-Date: Sun, 6 Sep 2015 13:55:03 +0800
-Subject: [PATCH 0626/1565] drm/amdgpu: remove the unnecessary parameter adev
- for amdgpu_fence_wait_any()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
-Reviewed-by: Christian König <christian.koenig@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu.h       | 3 +--
- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 9 ++-------
- drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c    | 2 +-
- 3 files changed, 4 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-index 39d9608..a9c0def 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-@@ -447,8 +447,7 @@ 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);
- 
--signed long amdgpu_fence_wait_any(struct amdgpu_device *adev,
--				  struct fence **array,
-+signed long amdgpu_fence_wait_any(struct fence **array,
- 				  uint32_t count,
- 				  bool intr,
- 				  signed long t);
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
-index 1fadc15..003a219 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
-@@ -857,16 +857,12 @@ static void amdgpu_fence_wait_cb(struct fence *fence, struct fence_cb *cb)
- static signed long amdgpu_fence_default_wait(struct fence *f, bool intr,
- 					     signed long t)
- {
--	struct amdgpu_fence *fence = to_amdgpu_fence(f);
--	struct amdgpu_device *adev = fence->ring->adev;
--
--	return amdgpu_fence_wait_any(adev, &f, 1, intr, t);
-+	return amdgpu_fence_wait_any(&f, 1, intr, t);
- }
- 
- /**
-  * Wait the fence array with timeout
-  *
-- * @adev:     amdgpu device
-  * @array:    the fence array with amdgpu fence pointer
-  * @count:    the number of the fence array
-  * @intr:     when sleep, set the current task interruptable or not
-@@ -874,8 +870,7 @@ static signed long amdgpu_fence_default_wait(struct fence *f, bool intr,
-  *
-  * It will return when any fence is signaled or timeout.
-  */
--signed long amdgpu_fence_wait_any(struct amdgpu_device *adev,
--				  struct fence **array, uint32_t count,
-+signed long amdgpu_fence_wait_any(struct fence **array, uint32_t count,
- 				  bool intr, signed long t)
- {
- 	struct amdgpu_wait_cb *cb;
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
-index e907124..5cb27d5 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
-@@ -372,7 +372,7 @@ int amdgpu_sa_bo_new(struct amdgpu_device *adev,
- 		} while (amdgpu_sa_bo_next_hole(sa_manager, fences, tries));
- 
- 		spin_unlock(&sa_manager->wq.lock);
--		t = amdgpu_fence_wait_any(adev, fences, AMDGPU_MAX_RINGS,
-+		t = amdgpu_fence_wait_any(fences, AMDGPU_MAX_RINGS,
- 					  false, MAX_SCHEDULE_TIMEOUT);
- 		r = (t > 0) ? 0 : t;
- 		spin_lock(&sa_manager->wq.lock);
--- 
-1.9.1
-