LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] drm: Remove unused code to load the non-existing fbcon.ko
@ 2021-08-18 12:09 Javier Martinez Canillas
  2021-08-18 12:33 ` Daniel Vetter
  0 siblings, 1 reply; 2+ messages in thread
From: Javier Martinez Canillas @ 2021-08-18 12:09 UTC (permalink / raw)
  To: linux-kernel
  Cc: Javier Martinez Canillas, Daniel Vetter, David Airlie,
	Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, dri-devel

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>
---

 drivers/gpu/drm/drm_kms_helper_common.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/drivers/gpu/drm/drm_kms_helper_common.c b/drivers/gpu/drm/drm_kms_helper_common.c
index f933da1656eb..47e92400548d 100644
--- a/drivers/gpu/drm/drm_kms_helper_common.c
+++ b/drivers/gpu/drm/drm_kms_helper_common.c
@@ -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();
 }
 
-- 
2.31.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] drm: Remove unused code to load the non-existing fbcon.ko
  2021-08-18 12:09 [PATCH] drm: Remove unused code to load the non-existing fbcon.ko Javier Martinez Canillas
@ 2021-08-18 12:33 ` Daniel Vetter
  0 siblings, 0 replies; 2+ messages in thread
From: Daniel Vetter @ 2021-08-18 12:33 UTC (permalink / raw)
  To: Javier Martinez Canillas
  Cc: linux-kernel, Daniel Vetter, David Airlie, Maarten Lankhorst,
	Maxime Ripard, Thomas Zimmermann, dri-devel

On Wed, Aug 18, 2021 at 02:09:48PM +0200, Javier Martinez Canillas wrote:
> 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>

Nice catch. Merged to drm-misc-next for 5.16, thanks.
-Daniel

> ---
> 
>  drivers/gpu/drm/drm_kms_helper_common.c | 11 -----------
>  1 file changed, 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_kms_helper_common.c b/drivers/gpu/drm/drm_kms_helper_common.c
> index f933da1656eb..47e92400548d 100644
> --- a/drivers/gpu/drm/drm_kms_helper_common.c
> +++ b/drivers/gpu/drm/drm_kms_helper_common.c
> @@ -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();
>  }
>  
> -- 
> 2.31.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-08-18 12:33 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-18 12:09 [PATCH] drm: Remove unused code to load the non-existing fbcon.ko Javier Martinez Canillas
2021-08-18 12:33 ` Daniel Vetter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).