summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Renner Berthing <kernel@esmil.dk>2021-09-25 19:38:15 +0300
committerEmil Renner Berthing <kernel@esmil.dk>2021-12-26 18:41:31 +0300
commit65fa4e698a680f24d20599b821c6052583fa96ea (patch)
tree0daedaedaf60a9352c365dbe6471472924266a38
parent04aa808960b377ca3dffbb30511d7fd688c40ba9 (diff)
downloadlinux-65fa4e698a680f24d20599b821c6052583fa96ea.tar.xz
nvdla: Support compilation as module
Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
-rw-r--r--drivers/nvdla/Kconfig3
-rw-r--r--drivers/nvdla/Makefile36
-rw-r--r--kernel/dma/coherent.c1
3 files changed, 21 insertions, 19 deletions
diff --git a/drivers/nvdla/Kconfig b/drivers/nvdla/Kconfig
index d992eef7cbb0..cc4268c3f682 100644
--- a/drivers/nvdla/Kconfig
+++ b/drivers/nvdla/Kconfig
@@ -1,5 +1,4 @@
config NVDLA
- bool "The NVIDIA Deep Learning Accelerator"
- default n
+ tristate "The NVIDIA Deep Learning Accelerator"
depends on DRM
select DRM_GEM_CMA_HELPER
diff --git a/drivers/nvdla/Makefile b/drivers/nvdla/Makefile
index 387577c23295..4ba437a0af8e 100644
--- a/drivers/nvdla/Makefile
+++ b/drivers/nvdla/Makefile
@@ -1,19 +1,21 @@
-ccflags-$(CONFIG_NVDLA) += -I$(srctree)/$(src)
-ccflags-$(CONFIG_NVDLA) += -I$(srctree)/$(src)/include
+ccflags-y += -I$(srctree)/$(src)
+ccflags-y += -I$(srctree)/$(src)/include
-obj-$(CONFIG_NVDLA) += scheduler.o
-obj-$(CONFIG_NVDLA) += engine.o
-obj-$(CONFIG_NVDLA) += bdma.o
-obj-$(CONFIG_NVDLA) += conv.o
-obj-$(CONFIG_NVDLA) += sdp.o
-obj-$(CONFIG_NVDLA) += cdp.o
-obj-$(CONFIG_NVDLA) += pdp.o
-obj-$(CONFIG_NVDLA) += rubik.o
-obj-$(CONFIG_NVDLA) += cache.o
-obj-$(CONFIG_NVDLA) += common.o
-obj-$(CONFIG_NVDLA) += engine_data.o
-obj-$(CONFIG_NVDLA) += engine_isr.o
-obj-$(CONFIG_NVDLA) += engine_debug.o
-obj-$(CONFIG_NVDLA) += nvdla_core_callbacks.o
-obj-$(CONFIG_NVDLA) += nvdla_gem.o
+nvdla-y := scheduler.o \
+ engine.o \
+ bdma.o \
+ conv.o \
+ sdp.o \
+ cdp.o \
+ pdp.o \
+ rubik.o \
+ cache.o \
+ common.o \
+ engine_data.o \
+ engine_isr.o \
+ engine_debug.o \
+ nvdla_core_callbacks.o \
+ nvdla_gem.o
+
+obj-$(CONFIG_NVDLA) += nvdla.o
diff --git a/kernel/dma/coherent.c b/kernel/dma/coherent.c
index 25fc85a7aebe..0d919b596fa7 100644
--- a/kernel/dma/coherent.c
+++ b/kernel/dma/coherent.c
@@ -130,6 +130,7 @@ int dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
dma_release_coherent_memory(mem);
return ret;
}
+EXPORT_SYMBOL_GPL(dma_declare_coherent_memory);
static void *__dma_alloc_from_coherent(struct device *dev,
struct dma_coherent_mem *mem,