aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0391-drm-amdgpu-remove-amdgpu_ring_from_fence.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0391-drm-amdgpu-remove-amdgpu_ring_from_fence.patch')
-rw-r--r--common/recipes-kernel/linux/files/0391-drm-amdgpu-remove-amdgpu_ring_from_fence.patch68
1 files changed, 68 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0391-drm-amdgpu-remove-amdgpu_ring_from_fence.patch b/common/recipes-kernel/linux/files/0391-drm-amdgpu-remove-amdgpu_ring_from_fence.patch
new file mode 100644
index 00000000..fc2b83d9
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0391-drm-amdgpu-remove-amdgpu_ring_from_fence.patch
@@ -0,0 +1,68 @@
+From e66103524443d0940bbf60bd37f7111a8518ffbc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
+Date: Fri, 11 Mar 2016 14:55:20 +0100
+Subject: [PATCH 0391/1110] drm/amdgpu: remove amdgpu_ring_from_fence
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Not used any more.
+
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Acked-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 24 ------------------------
+ 2 files changed, 25 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+index 3abc639..595133b 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+@@ -1171,7 +1171,6 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
+ struct amdgpu_irq_src *irq_src, unsigned irq_type,
+ enum amdgpu_ring_type ring_type);
+ void amdgpu_ring_fini(struct amdgpu_ring *ring);
+-struct amdgpu_ring *amdgpu_ring_from_fence(struct fence *f);
+
+ /*
+ * CS.
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+index 56c07e3..cc3c7ad 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+@@ -352,30 +352,6 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring)
+ }
+ }
+
+-/**
+- * amdgpu_ring_from_fence - get ring from fence
+- *
+- * @f: fence structure
+- *
+- * Extract the ring a fence belongs to. Handles both scheduler as
+- * well as hardware fences.
+- */
+-struct amdgpu_ring *amdgpu_ring_from_fence(struct fence *f)
+-{
+- struct amdgpu_fence *a_fence;
+- struct amd_sched_fence *s_fence;
+-
+- s_fence = to_amd_sched_fence(f);
+- if (s_fence)
+- return container_of(s_fence->sched, struct amdgpu_ring, sched);
+-
+- a_fence = to_amdgpu_fence(f);
+- if (a_fence)
+- return a_fence->ring;
+-
+- return NULL;
+-}
+-
+ /*
+ * Debugfs info
+ */
+--
+2.7.4
+