aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0392-drm-amdgpu-remove-amdgpu_fence_wait_next.patch
diff options
context:
space:
mode:
authorAwais Belal <awais_belal@mentor.com>2016-10-13 14:39:46 +0500
committerAwais Belal <awais_belal@mentor.com>2016-10-14 15:22:00 +0500
commit912c1466ad973230fcdd08b07f766d291a6c13a4 (patch)
tree3e7a0bdfdf033d61c2212f66c19bf192d41e49b2 /common/recipes-kernel/linux/files/0392-drm-amdgpu-remove-amdgpu_fence_wait_next.patch
parentb701f13977df4dd34e618e7d074220782b27dd34 (diff)
downloadmeta-amd-912c1466ad973230fcdd08b07f766d291a6c13a4.tar.gz
meta-amd-912c1466ad973230fcdd08b07f766d291a6c13a4.tar.bz2
meta-amd-912c1466ad973230fcdd08b07f766d291a6c13a4.zip
SE/BE: move to 4.4 kernel
This commit does a few things which cannot be separated easily so it cannot be split in to separate commits. * Drops all 4.1 kernel bits. * Moves all common patches from meta-amdfalconx86 to common. * Moves SE/BE builds to 4.4 kernel. Signed-off-by: Awais Belal <awais_belal@mentor.com>
Diffstat (limited to 'common/recipes-kernel/linux/files/0392-drm-amdgpu-remove-amdgpu_fence_wait_next.patch')
-rw-r--r--common/recipes-kernel/linux/files/0392-drm-amdgpu-remove-amdgpu_fence_wait_next.patch64
1 files changed, 64 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0392-drm-amdgpu-remove-amdgpu_fence_wait_next.patch b/common/recipes-kernel/linux/files/0392-drm-amdgpu-remove-amdgpu_fence_wait_next.patch
new file mode 100644
index 00000000..7aec724e
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0392-drm-amdgpu-remove-amdgpu_fence_wait_next.patch
@@ -0,0 +1,64 @@
+From cb4d67f0d23ffb6637b22b2d8a0f8b44a9b4fbaf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
+Date: Fri, 11 Mar 2016 15:15:02 +0100
+Subject: [PATCH 0392/1110] drm/amdgpu: remove amdgpu_fence_wait_next
+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_fence.c | 20 --------------------
+ 2 files changed, 21 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+index 595133b..0f6ee5d 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+@@ -393,7 +393,6 @@ void amdgpu_fence_driver_suspend(struct amdgpu_device *adev);
+ void amdgpu_fence_driver_resume(struct amdgpu_device *adev);
+ int amdgpu_fence_emit(struct amdgpu_ring *ring, struct fence **fence);
+ void amdgpu_fence_process(struct amdgpu_ring *ring);
+-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);
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+index 83599f2..fabb01e 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+@@ -282,26 +282,6 @@ static int amdgpu_fence_ring_wait_seq(struct amdgpu_ring *ring, uint64_t seq)
+ }
+
+ /**
+- * amdgpu_fence_wait_next - wait for the next fence to signal
+- *
+- * @adev: amdgpu device pointer
+- * @ring: ring index the fence is associated with
+- *
+- * Wait for the next fence on the requested ring to signal (all asics).
+- * Returns 0 if the next fence has passed, error for all other cases.
+- * Caller must hold ring lock.
+- */
+-int amdgpu_fence_wait_next(struct amdgpu_ring *ring)
+-{
+- uint64_t seq = atomic64_read(&ring->fence_drv.last_seq) + 1ULL;
+-
+- if (seq >= ring->fence_drv.sync_seq)
+- return -ENOENT;
+-
+- return amdgpu_fence_ring_wait_seq(ring, seq);
+-}
+-
+-/**
+ * amdgpu_fence_wait_empty - wait for all fences to signal
+ *
+ * @adev: amdgpu device pointer
+--
+2.7.4
+