Commit 6fa701d1 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Daniel Vetter
Browse files

drm: Remove unused code to load the non-existing fbcon.ko 



Commit 6104c370 ("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: default avatarJavier Martinez Canillas <javierm@redhat.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210818120948.451896-1-javierm@redhat.com
parent 072e70d5

drivers/gpu/drm/drm_kms_helper_common.c

+0 −11
Original line number Diff line number Diff line
@@ -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();

}