drm: Remove unused code to load the non-existing fbcon.ko
Subsystems (2)
PATCH 1/1 drm: Remove unused code to load the non-existing fbcon.ko
Commit 6104c37094e7 ("fbcon: Make fbcon a built-time depency for fbdev") changed the FRAMEBUFFER_CONSOLE Kconfig symbol from tristate to bool.
But the drm_kms_helper_init() function still attempts to load the fbcon module, even when this is always built-in since the mentioned change.
Signed-off-by Javier Martinez Canillas <[email protected]>
---
drivers/gpu/drm/drm_kms_helper_common.c | 11 ----------- 1 file changed, 11 deletions(-)
drivers/gpu/drm/drm_kms_helper_common.c +0 -11
@@ -64,17 +64,6 @@ MODULE_PARM_DESC(edid_firmware,static int __init drm_kms_helper_init (void ) { -/* -* The Kconfig DRM_KMS_HELPER selects FRAMEBUFFER_CONSOLE (if !EXPERT) -* but the module doesn't depend on any fb console symbols. At least -* attempt to load fbcon to avoid leaving the system without a usable -* console. -*/ -if (IS_ENABLED (CONFIG_DRM_FBDEV_EMULATION ) && -IS_MODULE (CONFIG_FRAMEBUFFER_CONSOLE ) && - !IS_ENABLED (CONFIG_EXPERT )) -request_module_nowait ("fbcon" ); -return drm_dp_aux_dev_init (); }
Signature · 1 line
2.31.1
Quoted 7 lines · Javier Martinez Canillas
Commit
6104c37094e7("fbcon: Make fbcon a built-time depency for fbdev") changed theFRAMEBUFFER_CONSOLEKconfigsymbol from tristate to bool.But the
drm_kms_helper_init()function still attempts to load the fbcon module, even when this is always built-in since the mentioned change.Signed-off-by Javier Martinez Canillas <[email protected]>
Nice catch. Merged to drm-misc-next for 5.16, thanks. -Daniel
Quoted 30 lines
---
drivers/gpu/drm/drm_kms_helper_common.c | 11 ----------- 1 file changed, 11 deletions(-)drivers/gpu/drm/drm_kms_helper_common.c +0
-11@@ -64,17 +64,6 @@ MODULE_PARM_DESC(edid_firmware,static int __init drm_kms_helper_init (void ) { -/* -* The Kconfig DRM_KMS_HELPER selects FRAMEBUFFER_CONSOLE (if !EXPERT) -* but the module doesn't depend on any fb console symbols. At least -* attempt to load fbcon to avoid leaving the system without a usable -* console. -*/ -if (IS_ENABLED (CONFIG_DRM_FBDEV_EMULATION ) && -IS_MODULE (CONFIG_FRAMEBUFFER_CONSOLE ) && - !IS_ENABLED (CONFIG_EXPERT )) -request_module_nowait ("fbcon" ); -return drm_dp_aux_dev_init (); }Signature · 1 line
2.31.1
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch