aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0393-drm-amdgpu-move-fence-structure-into-amdgpu_fence.c.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0393-drm-amdgpu-move-fence-structure-into-amdgpu_fence.c.patch')
-rw-r--r--common/recipes-kernel/linux/files/0393-drm-amdgpu-move-fence-structure-into-amdgpu_fence.c.patch119
1 files changed, 0 insertions, 119 deletions
diff --git a/common/recipes-kernel/linux/files/0393-drm-amdgpu-move-fence-structure-into-amdgpu_fence.c.patch b/common/recipes-kernel/linux/files/0393-drm-amdgpu-move-fence-structure-into-amdgpu_fence.c.patch
deleted file mode 100644
index 8a6f42dc..00000000
--- a/common/recipes-kernel/linux/files/0393-drm-amdgpu-move-fence-structure-into-amdgpu_fence.c.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 1bfbfdfdebe5ddde2ecdc0448ab3eff6ea8726e8 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:12:53 +0100
-Subject: [PATCH 0393/1110] drm/amdgpu: move fence structure into
- amdgpu_fence.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-No need to have that in the header file any more.
-
-Signed-off-by: Christian K├Ânig <christian.koenig@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 25 -------------------------
- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 26 +++++++++++++++++++++++++-
- 2 files changed, 25 insertions(+), 26 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-index 0f6ee5d..19f8c46 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-@@ -141,7 +141,6 @@ extern unsigned amdgpu_pcie_lane_cap;
- #define CIK_CURSOR_HEIGHT 128
-
- struct amdgpu_device;
--struct amdgpu_fence;
- struct amdgpu_ib;
- struct amdgpu_vm;
- struct amdgpu_ring;
-@@ -364,16 +363,6 @@ struct amdgpu_fence_driver {
- #define AMDGPU_FENCE_FLAG_64BIT (1 << 0)
- #define AMDGPU_FENCE_FLAG_INT (1 << 1)
-
--struct amdgpu_fence {
-- struct fence base;
--
-- /* RB, DMA, etc. */
-- struct amdgpu_ring *ring;
-- uint64_t seq;
--
-- wait_queue_t fence_wake;
--};
--
- struct amdgpu_user_fence {
- /* write-back bo */
- struct amdgpu_bo *bo;
-@@ -2073,20 +2062,6 @@ u32 amdgpu_mm_rdoorbell(struct amdgpu_device *adev, u32 index);
- void amdgpu_mm_wdoorbell(struct amdgpu_device *adev, u32 index, u32 v);
-
- /*
-- * Cast helper
-- */
--extern const struct fence_ops amdgpu_fence_ops;
--static inline struct amdgpu_fence *to_amdgpu_fence(struct fence *f)
--{
-- struct amdgpu_fence *__f = container_of(f, struct amdgpu_fence, base);
--
-- if (__f->base.ops == &amdgpu_fence_ops)
-- return __f;
--
-- return NULL;
--}
--
--/*
- * Registers read & write functions.
- */
- #define RREG32(reg) amdgpu_mm_rreg(adev, (reg), false)
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
-index fabb01e..3db18f4 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
-@@ -47,9 +47,33 @@
- * that the the relevant GPU caches have been flushed.
- */
-
-+struct amdgpu_fence {
-+ struct fence base;
-+
-+ /* RB, DMA, etc. */
-+ struct amdgpu_ring *ring;
-+ uint64_t seq;
-+
-+ wait_queue_t fence_wake;
-+};
-+
- static struct kmem_cache *amdgpu_fence_slab;
- static atomic_t amdgpu_fence_slab_ref = ATOMIC_INIT(0);
-
-+/*
-+ * Cast helper
-+ */
-+static const struct fence_ops amdgpu_fence_ops;
-+static inline struct amdgpu_fence *to_amdgpu_fence(struct fence *f)
-+{
-+ struct amdgpu_fence *__f = container_of(f, struct amdgpu_fence, base);
-+
-+ if (__f->base.ops == &amdgpu_fence_ops)
-+ return __f;
-+
-+ return NULL;
-+}
-+
- /**
- * amdgpu_fence_write - write a fence value
- *
-@@ -663,7 +687,7 @@ static void amdgpu_fence_release(struct fence *f)
- kmem_cache_free(amdgpu_fence_slab, fence);
- }
-
--const struct fence_ops amdgpu_fence_ops = {
-+static const struct fence_ops amdgpu_fence_ops = {
- .get_driver_name = amdgpu_fence_get_driver_name,
- .get_timeline_name = amdgpu_fence_get_timeline_name,
- .enable_signaling = amdgpu_fence_enable_signaling,
---
-2.7.4
-