Unverified Commit e9aeeba2 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas
Browse files

drm: Decouple nomodeset from CONFIG_VGA_CONSOLE 



This relationship was only for historical reasons and the nomodeset option
should be available even on platforms that don't enable CONFIG_VGA_CONSOLE.

Suggested-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Acked-by: default avatarPekka Paalanen <pekka.paalanen@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211112133230.1595307-5-javierm@redhat.com
parent 6a2d2ddf

drivers/gpu/drm/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
menuconfig DRM

	tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"

	depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && HAS_DMA

	select DRM_NOMODESET

	select DRM_PANEL_ORIENTATION_QUIRKS

	select HDMI

	select FB_CMDLINE
@@ -492,6 +493,11 @@ config DRM_EXPORT_FOR_TESTS 
config DRM_PANEL_ORIENTATION_QUIRKS

	tristate



# Separate option because nomodeset parameter is global and expected built-in

config DRM_NOMODESET

	bool

	default n



config DRM_LIB_RANDOM

	bool

	default n

drivers/gpu/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ drm-$(CONFIG_DRM_PRIVACY_SCREEN) += drm_privacy_screen.o drm_privacy_screen_x86. 


obj-$(CONFIG_DRM_DP_AUX_BUS) += drm_dp_aux_bus.o



obj-$(CONFIG_VGA_CONSOLE) += drm_nomodeset.o

obj-$(CONFIG_DRM_NOMODESET) += drm_nomodeset.o



drm_cma_helper-y := drm_gem_cma_helper.o

obj-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_cma_helper.o

include/drm/drm_drv.h

+0 −4
Original line number Diff line number Diff line
@@ -601,10 +601,6 @@ static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev) 


int drm_dev_set_unique(struct drm_device *dev, const char *name);



#ifdef CONFIG_VGA_CONSOLE

extern bool drm_firmware_drivers_only(void);

#else

static inline bool drm_firmware_drivers_only(void) { return false; }

#endif



#endif