Commit 9b0a490e authored by Daniel Vetter's avatar Daniel Vetter

fbcon: delete delayed loading code

Before

commit 6104c370
Author: Daniel Vetter <daniel.vetter@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: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Claudio Suarez <cssk@net-c.es>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Du Cheng <ducheng2@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220405210335.3434130-5-daniel.vetter@ffwll.ch
parent 409d6c95
...@@ -944,7 +944,7 @@ static const char *fbcon_startup(void) ...@@ -944,7 +944,7 @@ static const char *fbcon_startup(void)
return display_desc; return display_desc;
/* /*
* Instead of blindly using registered_fb[0], we use info_idx, set by * Instead of blindly using registered_fb[0], we use info_idx, set by
* fb_console_init(); * fbcon_fb_registered();
*/ */
info = registered_fb[info_idx]; info = registered_fb[info_idx];
if (!info) if (!info)
...@@ -3299,17 +3299,6 @@ static void fbcon_start(void) ...@@ -3299,17 +3299,6 @@ static void fbcon_start(void)
return; return;
} }
#endif #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) static void fbcon_exit(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment