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: Thomas Zimmermann tzimmermann@suse.de Signed-off-by: Javier Martinez Canillas javierm@redhat.com Acked-by: Thomas Zimmermann tzimmermann@suse.de ---
(no changes since v1)
drivers/gpu/drm/Kconfig | 6 ++++++ drivers/gpu/drm/Makefile | 2 +- include/drm/drm_mode_config.h | 4 ---- 3 files changed, 7 insertions(+), 5 deletions(-)
diff --git drivers/gpu/drm/Kconfig drivers/gpu/drm/Kconfig index fb144617055b..483d534eb074 100644 --- drivers/gpu/drm/Kconfig +++ drivers/gpu/drm/Kconfig @@ -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 @@ -493,6 +494,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 diff --git drivers/gpu/drm/Makefile drivers/gpu/drm/Makefile index c74810c285af..fa16d3e0bbdc 100644 --- drivers/gpu/drm/Makefile +++ drivers/gpu/drm/Makefile @@ -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 diff --git include/drm/drm_mode_config.h include/drm/drm_mode_config.h index f4d407908348..4bb129040185 100644 --- include/drm/drm_mode_config.h +++ include/drm/drm_mode_config.h @@ -969,10 +969,6 @@ static inline int drm_mode_config_init(struct drm_device *dev) void drm_mode_config_reset(struct drm_device *dev); void drm_mode_config_cleanup(struct drm_device *dev);
-#ifdef CONFIG_VGA_CONSOLE extern bool drm_get_modeset(void); -#else -static inline bool drm_get_modeset(void) { return true; } -#endif
#endif