drm/gpuvm: allow building as module

Currently, the DRM GPUVM does not have any core dependencies preventing
a module build.

Also, new features from subsequent patches require helpers (namely
drm_exec) which can be built as module.

Reviewed-by: Christian König <[email protected]>
Reviewed-by: Dave Airlie <[email protected]>
Signed-off-by: Danilo Krummrich <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index ab9ef1c2034912d8fc330f6009a81dc31759f5b5..48ca28a2e4ff8ad8be8c5a47bea4a140f362a9a7 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -216,6 +216,13 @@ config DRM_EXEC
        help
          Execution context for command submissions
 
+config DRM_GPUVM
+       tristate
+       depends on DRM
+       help
+         GPU-VM representation providing helpers to manage a GPUs virtual
+         address space
+
 config DRM_BUDDY
        tristate
        depends on DRM

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 7a84b3cddeabc45550fe8b52fa95cb72327aa9b0..8e1bde059170ed4ad033ce97756a3570175ec665 100644 (file)
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -45,7 +45,6 @@ drm-y := \
        drm_vblank.o \
        drm_vblank_work.o \
        drm_vma_manager.o \
-       drm_gpuvm.o \
        drm_writeback.o
 drm-$(CONFIG_DRM_LEGACY) += \
        drm_agpsupport.o \
@@ -81,6 +80,7 @@ obj-$(CONFIG_DRM_PANEL_ORIENTATION_QUIRKS) += drm_panel_orientation_quirks.o
 #
 #
 obj-$(CONFIG_DRM_EXEC) += drm_exec.o
+obj-$(CONFIG_DRM_GPUVM) += drm_gpuvm.o
 
 obj-$(CONFIG_DRM_BUDDY) += drm_buddy.o
 

diff --git a/drivers/gpu/drm/drm_gpuvm.c b/drivers/gpu/drm/drm_gpuvm.c
index d55267db76aedbf2fc87b4e4ccd46e27d2bcf32b..02ecb45a2544780a263b26a9adad1671b7cc69db 100644 (file)
--- a/drivers/gpu/drm/drm_gpuvm.c
+++ b/drivers/gpu/drm/drm_gpuvm.c
@@ -1723,3 +1723,6 @@ drm_gpuva_ops_free(struct drm_gpuvm *gpuvm,
        kfree(ops);
 }
 EXPORT_SYMBOL_GPL(drm_gpuva_ops_free);
+
+MODULE_DESCRIPTION("DRM GPUVM");
+MODULE_LICENSE("GPL");

diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index c52e8096cca415893269c0fed15c5da3c17ec0aa..1e6aaf95ff7c79483f7d8bba1ddce897bb7affcf 100644 (file)
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -11,6 +11,7 @@ config DRM_NOUVEAU
        select DRM_TTM
        select DRM_TTM_HELPER
        select DRM_EXEC
+       select DRM_GPUVM
        select DRM_SCHED
        select I2C
        select I2C_ALGOBIT