Skip to content

Commit e9aeeba

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: Thomas Zimmermann <[email protected]> Signed-off-by: Javier Martinez Canillas <[email protected]> Acked-by: Thomas Zimmermann <[email protected]> Acked-by: Jani Nikula <[email protected]> Acked-by: Pekka Paalanen <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 6a2d2dd commit e9aeeba

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

drivers/gpu/drm/Kconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
menuconfig DRM
99
tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
1010
depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && HAS_DMA
11+
select DRM_NOMODESET
1112
select DRM_PANEL_ORIENTATION_QUIRKS
1213
select HDMI
1314
select FB_CMDLINE
@@ -492,6 +493,11 @@ config DRM_EXPORT_FOR_TESTS
492493
config DRM_PANEL_ORIENTATION_QUIRKS
493494
tristate
494495

496+
# Separate option because nomodeset parameter is global and expected built-in
497+
config DRM_NOMODESET
498+
bool
499+
default n
500+
495501
config DRM_LIB_RANDOM
496502
bool
497503
default n

drivers/gpu/drm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ drm-$(CONFIG_DRM_PRIVACY_SCREEN) += drm_privacy_screen.o drm_privacy_screen_x86.
3333

3434
obj-$(CONFIG_DRM_DP_AUX_BUS) += drm_dp_aux_bus.o
3535

36-
obj-$(CONFIG_VGA_CONSOLE) += drm_nomodeset.o
36+
obj-$(CONFIG_DRM_NOMODESET) += drm_nomodeset.o
3737

3838
drm_cma_helper-y := drm_gem_cma_helper.o
3939
obj-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_cma_helper.o

include/drm/drm_drv.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -601,10 +601,6 @@ static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev)
601601

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

604-
#ifdef CONFIG_VGA_CONSOLE
605604
extern bool drm_firmware_drivers_only(void);
606-
#else
607-
static inline bool drm_firmware_drivers_only(void) { return false; }
608-
#endif
609605

610606
#endif

0 commit comments

Comments
 (0)