Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <javierm@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210818120948.451896-1-javierm@redhat.com

authored by

Javier Martinez Canillas and committed by
Daniel Vetter
6fa701d1 072e70d5

-11
-11
drivers/gpu/drm/drm_kms_helper_common.c
··· 64 64 65 65 static int __init drm_kms_helper_init(void) 66 66 { 67 - /* 68 - * The Kconfig DRM_KMS_HELPER selects FRAMEBUFFER_CONSOLE (if !EXPERT) 69 - * but the module doesn't depend on any fb console symbols. At least 70 - * attempt to load fbcon to avoid leaving the system without a usable 71 - * console. 72 - */ 73 - if (IS_ENABLED(CONFIG_DRM_FBDEV_EMULATION) && 74 - IS_MODULE(CONFIG_FRAMEBUFFER_CONSOLE) && 75 - !IS_ENABLED(CONFIG_EXPERT)) 76 - request_module_nowait("fbcon"); 77 - 78 67 return drm_dp_aux_dev_init(); 79 68 } 80 69