File tree Expand file tree Collapse file tree 3 files changed +7
-5
lines changed Expand file tree Collapse file tree 3 files changed +7
-5
lines changed Original file line number Diff line number Diff line change 8
8
menuconfig DRM
9
9
tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
10
10
depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && HAS_DMA
11
+ select DRM_NOMODESET
11
12
select DRM_PANEL_ORIENTATION_QUIRKS
12
13
select HDMI
13
14
select FB_CMDLINE
@@ -492,6 +493,11 @@ config DRM_EXPORT_FOR_TESTS
492
493
config DRM_PANEL_ORIENTATION_QUIRKS
493
494
tristate
494
495
496
+ # Separate option because nomodeset parameter is global and expected built-in
497
+ config DRM_NOMODESET
498
+ bool
499
+ default n
500
+
495
501
config DRM_LIB_RANDOM
496
502
bool
497
503
default n
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ drm-$(CONFIG_DRM_PRIVACY_SCREEN) += drm_privacy_screen.o drm_privacy_screen_x86.
33
33
34
34
obj-$(CONFIG_DRM_DP_AUX_BUS) += drm_dp_aux_bus.o
35
35
36
- obj-$(CONFIG_VGA_CONSOLE ) += drm_nomodeset.o
36
+ obj-$(CONFIG_DRM_NOMODESET ) += drm_nomodeset.o
37
37
38
38
drm_cma_helper-y := drm_gem_cma_helper.o
39
39
obj-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_cma_helper.o
Original file line number Diff line number Diff line change @@ -601,10 +601,6 @@ static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev)
601
601
602
602
int drm_dev_set_unique (struct drm_device * dev , const char * name );
603
603
604
- #ifdef CONFIG_VGA_CONSOLE
605
604
extern bool drm_firmware_drivers_only (void );
606
- #else
607
- static inline bool drm_firmware_drivers_only (void ) { return false; }
608
- #endif
609
605
610
606
#endif
You can’t perform that action at this time.
0 commit comments