[Intel-gfx] [PATCH v2 04/19] fbcon: delete delayed loading code

[Thomas Zimmermann]

Am 08.02.22 um 22:08 schrieb Daniel Vetter:
> Before
> 
> commit 6104c37094e729f3d4ce65797002112735d49cd1
> Author: Daniel Vetter <daniel.vetter at ffwll.ch>
> Date:   Tue Aug 1 17:32:07 2017 +0200
> 
>      fbcon: Make fbcon a built-time depency for fbdev
> 
> it was possible to load fbcon and fbdev drivers in any order, which
> means that fbcon init had to handle the case where fbdev drivers where
> already registered.
> 
> This is no longer possible, hence delete that code.
> 
> Note that the exit case is a bit more complex and will be done in a
> separate patch.
> 
> Since I had to audit the entire fbcon load code I also spotted a wrong
> function name in a comment in fbcon_startup(), which this patch also
> fixes.
> 
> v2: Explain why we also fix the comment (Sam)
> 
> Acked-by: Sam Ravnborg <sam at ravnborg.org>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> Cc: Helge Deller <deller at gmx.de>
> Cc: Daniel Vetter <daniel at ffwll.ch>
> Cc: Claudio Suarez <cssk at net-c.es>
> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> Cc: Tetsuo Handa <penguin-kernel at I-love.SAKURA.ne.jp>
> Cc: Du Cheng <ducheng2 at gmail.com>

Acked-by: Thomas Zimmermann <tzimmermann at suse.de>

> ---
>   drivers/video/fbdev/core/fbcon.c | 13 +------------
>   1 file changed, 1 insertion(+), 12 deletions(-)
> 
> diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
> index b75e638cb83d..83f0223f5333 100644
> --- a/drivers/video/fbdev/core/fbcon.c
> +++ b/drivers/video/fbdev/core/fbcon.c
> @@ -944,7 +944,7 @@ static const char *fbcon_startup(void)
>   		return display_desc;
>   	/*
>   	 * Instead of blindly using registered_fb[0], we use info_idx, set by
> -	 * fb_console_init();
> +	 * fbcon_fb_registered();
>   	 */
>   	info = registered_fb[info_idx];
>   	if (!info)
> @@ -3299,17 +3299,6 @@ static void fbcon_start(void)
>   		return;
>   	}
>   #endif
> -
> -	if (num_registered_fb) {
> -		int i;
> -
> -		for_each_registered_fb(i) {
> -			info_idx = i;
> -			break;
> -		}
> -
> -		do_fbcon_takeover(0);
> -	}
>   }
>   
>   static void fbcon_exit(void)

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/intel-gfx/attachments/20220210/74cbfdfa/attachment.sig>