Commit 02e415f8 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm: Merge CONFIG_DRM_VM into CONFIG_DRM_LEGACY 



CONFIG_DRM_VM gets selected by CONFIG_DRM_LEGACY, but nothing else. So
remove it and build drm_vm.o as part of CONFIG_DRM_LEGACY.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210112081035.6882-5-tzimmermann@suse.de
parent 413c6466

drivers/gpu/drm/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -214,10 +214,6 @@ config DRM_GEM_SHMEM_HELPER 
	help

	  Choose this if you need the GEM shmem helper functions



config DRM_VM

	bool

	depends on DRM && MMU



config DRM_SCHED

	tristate

	depends on DRM
@@ -391,7 +387,6 @@ source "drivers/gpu/drm/xlnx/Kconfig" 
menuconfig DRM_LEGACY

	bool "Enable legacy drivers (DANGEROUS)"

	depends on DRM && MMU

	select DRM_VM

	help

	  Enable legacy DRI1 drivers. Those drivers expose unsafe and dangerous

	  APIs to user-space, which can be used to circumvent access

drivers/gpu/drm/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -21,9 +21,8 @@ drm-y := drm_auth.o drm_cache.o \ 
		drm_managed.o drm_vblank_work.o



drm-$(CONFIG_DRM_LEGACY) += drm_bufs.o drm_context.o drm_dma.o drm_legacy_misc.o drm_lock.o \

		drm_memory.o drm_scatter.o

		drm_memory.o drm_scatter.o drm_vm.o

drm-$(CONFIG_DRM_LIB_RANDOM) += lib/drm_random.o

drm-$(CONFIG_DRM_VM) += drm_vm.o

drm-$(CONFIG_COMPAT) += drm_ioc32.o

drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o

drm-$(CONFIG_DRM_GEM_SHMEM_HELPER) += drm_gem_shmem_helper.o

drivers/gpu/drm/drm_legacy.h

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static inline void drm_legacy_master_rmmaps(struct drm_device *dev, 
static inline void drm_legacy_rmmaps(struct drm_device *dev) {}

#endif



#if IS_ENABLED(CONFIG_DRM_VM) && IS_ENABLED(CONFIG_DRM_LEGACY)

#if IS_ENABLED(CONFIG_DRM_LEGACY)

void drm_legacy_vma_flush(struct drm_device *d);

#else

static inline void drm_legacy_vma_flush(struct drm_device *d)