Danilo Krummrich
2023-Aug-20 21:53 UTC
[Nouveau] [PATCH drm-misc-next 1/3] drm: drm_exec: build always builtin
drm_exec must always be builtin for the DRM GPUVA manager to depend on
it.
Signed-off-by: Danilo Krummrich <dakr at redhat.com>
---
drivers/gpu/drm/Kconfig | 6 ------
drivers/gpu/drm/Makefile | 3 +--
drivers/gpu/drm/nouveau/Kconfig | 1 -
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index ab9ef1c20349..85122d4bb1e7 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -210,12 +210,6 @@ config DRM_TTM_KUNIT_TEST
If in doubt, say "N".
-config DRM_EXEC
- tristate
- depends on DRM
- help
- Execution context for command submissions
-
config DRM_BUDDY
tristate
depends on DRM
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 215e78e79125..388e0964a875 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -23,6 +23,7 @@ drm-y := \
drm_dumb_buffers.o \
drm_edid.o \
drm_encoder.o \
+ drm_exec.o \
drm_file.o \
drm_fourcc.o \
drm_framebuffer.o \
@@ -80,8 +81,6 @@ obj-$(CONFIG_DRM_PANEL_ORIENTATION_QUIRKS) +=
drm_panel_orientation_quirks.o
# Memory-management helpers
#
#
-obj-$(CONFIG_DRM_EXEC) += drm_exec.o
-
obj-$(CONFIG_DRM_BUDDY) += drm_buddy.o
drm_dma_helper-y := drm_gem_dma_helper.o
diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index c52e8096cca4..2dddedac125b 100644
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -10,7 +10,6 @@ config DRM_NOUVEAU
select DRM_KMS_HELPER
select DRM_TTM
select DRM_TTM_HELPER
- select DRM_EXEC
select DRM_SCHED
select I2C
select I2C_ALGOBIT
--
2.41.0
Christian König
2023-Aug-21 09:49 UTC
[Nouveau] [PATCH drm-misc-next 1/3] drm: drm_exec: build always builtin
Am 20.08.23 um 23:53 schrieb Danilo Krummrich:> drm_exec must always be builtin for the DRM GPUVA manager to depend on > it.You should probably go the other way around and not always build in the GPUVA manager. We have intentionally and with quite a bit of work moved the DRM_EXEC and DRM_BUDDY into separate modules. Regards, Christian.> > Signed-off-by: Danilo Krummrich <dakr at redhat.com> > --- > drivers/gpu/drm/Kconfig | 6 ------ > drivers/gpu/drm/Makefile | 3 +-- > drivers/gpu/drm/nouveau/Kconfig | 1 - > 3 files changed, 1 insertion(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > index ab9ef1c20349..85122d4bb1e7 100644 > --- a/drivers/gpu/drm/Kconfig > +++ b/drivers/gpu/drm/Kconfig > @@ -210,12 +210,6 @@ config DRM_TTM_KUNIT_TEST > > If in doubt, say "N". > > -config DRM_EXEC > - tristate > - depends on DRM > - help > - Execution context for command submissions > - > config DRM_BUDDY > tristate > depends on DRM > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile > index 215e78e79125..388e0964a875 100644 > --- a/drivers/gpu/drm/Makefile > +++ b/drivers/gpu/drm/Makefile > @@ -23,6 +23,7 @@ drm-y := \ > drm_dumb_buffers.o \ > drm_edid.o \ > drm_encoder.o \ > + drm_exec.o \ > drm_file.o \ > drm_fourcc.o \ > drm_framebuffer.o \ > @@ -80,8 +81,6 @@ obj-$(CONFIG_DRM_PANEL_ORIENTATION_QUIRKS) += drm_panel_orientation_quirks.o > # Memory-management helpers > # > # > -obj-$(CONFIG_DRM_EXEC) += drm_exec.o > - > obj-$(CONFIG_DRM_BUDDY) += drm_buddy.o > > drm_dma_helper-y := drm_gem_dma_helper.o > diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig > index c52e8096cca4..2dddedac125b 100644 > --- a/drivers/gpu/drm/nouveau/Kconfig > +++ b/drivers/gpu/drm/nouveau/Kconfig > @@ -10,7 +10,6 @@ config DRM_NOUVEAU > select DRM_KMS_HELPER > select DRM_TTM > select DRM_TTM_HELPER > - select DRM_EXEC > select DRM_SCHED > select I2C > select I2C_ALGOBIT