61 lines
1.6 KiB
Diff
61 lines
1.6 KiB
Diff
From 115cdb5a06b112674d9652ef44d7f19583ff0136 Mon Sep 17 00:00:00 2001
|
|
From: David McFarland <corngood@gmail.com>
|
|
Date: Wed, 26 Oct 2016 22:26:39 -0300
|
|
Subject: [PATCH 13/14] Remove dependency on System.map
|
|
|
|
---
|
|
amd/backport/Makefile | 3 +--
|
|
amd/backport/kcl_fence.c | 10 ++++++++--
|
|
amd/backport/symbols | 3 ---
|
|
3 files changed, 9 insertions(+), 7 deletions(-)
|
|
delete mode 100644 amd/backport/symbols
|
|
|
|
diff --git a/amd/backport/Makefile b/amd/backport/Makefile
|
|
index dcc94d5..ef27e94 100644
|
|
--- a/amd/backport/Makefile
|
|
+++ b/amd/backport/Makefile
|
|
@@ -55,10 +55,9 @@ ccflags-y += -DOS_NAME_RHEL_7
|
|
endif
|
|
endif
|
|
|
|
-BACKPORT_OBJS = symbols.o
|
|
endif
|
|
|
|
-BACKPORT_OBJS += kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o
|
|
+BACKPORT_OBJS = kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o
|
|
|
|
amdgpu-y += $(addprefix ../backport/,$(BACKPORT_OBJS))
|
|
|
|
diff --git a/amd/backport/kcl_fence.c b/amd/backport/kcl_fence.c
|
|
index 8c697aa..85d96d3 100644
|
|
--- a/amd/backport/kcl_fence.c
|
|
+++ b/amd/backport/kcl_fence.c
|
|
@@ -25,8 +25,14 @@ struct default_wait_cb {
|
|
struct task_struct *task;
|
|
};
|
|
|
|
-extern void
|
|
-(*fence_default_wait_cb)(struct fence *fence, struct fence_cb *cb);
|
|
+static void
|
|
+fence_default_wait_cb(struct fence *fence, struct fence_cb *cb)
|
|
+{
|
|
+ struct default_wait_cb *wait =
|
|
+ container_of(cb, struct default_wait_cb, base);
|
|
+
|
|
+ wake_up_process(wait->task);
|
|
+}
|
|
|
|
signed long
|
|
_kcl_fence_wait_any_timeout(struct fence **fences, uint32_t count,
|
|
diff --git a/amd/backport/symbols b/amd/backport/symbols
|
|
deleted file mode 100644
|
|
index 2d3f2ee..0000000
|
|
--- a/amd/backport/symbols
|
|
+++ /dev/null
|
|
@@ -1,3 +0,0 @@
|
|
-SYMS=""
|
|
-
|
|
-SYMS+="fence_default_wait_cb"
|
|
--
|
|
2.10.1
|
|
|