Commit 12d5796d authored by Thomas Zimmermann's avatar Thomas Zimmermann

Revert "fbcon: don't lose the console font across generic->chip driver switch"

This reverts commit ae128786.

Always free the console font when deinitializing the framebuffer
console. Subsequent framebuffer consoles will then use the default
font. Rely on userspace to load any user-configured font for these
consoles.

Commit ae128786 ("fbcon: don't lose the console font across
generic->chip driver switch") was introduced to work around losing
the font during graphics-device handover. [1][2] It kept a dangling
pointer with the font data between loading the two consoles, which is
fairly adventurous hack. It also never covered cases when the other
consoles, such as VGA text mode, where involved.

The problem has meanwhile been solved in userspace. Systemd comes
with a udev rule that re-installs the configured font when a console
comes up. [3] So the kernel workaround can be removed.

This also removes one of the two special cases triggered by setting
FBINFO_MISC_FIRMWARE in an fbdev driver.

Tested during device handover from efifb and simpledrm to radeon. Udev
reloads the configured console font for the new driver's terminal.
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://bugzilla.redhat.com/show_bug.cgi?id=892340 # 1
Link: https://bugzilla.redhat.com/show_bug.cgi?id=1074624 # 2
Link: https://cgit.freedesktop.org/systemd/systemd/tree/src/vconsole/90-vconsole.rules.in?h=v222 # 3
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221219160516.23436-3-tzimmermann@suse.de
parent 06cfbd38
...@@ -958,7 +958,7 @@ static const char *fbcon_startup(void) ...@@ -958,7 +958,7 @@ static const char *fbcon_startup(void)
set_blitting_type(vc, info); set_blitting_type(vc, info);
/* Setup default font */ /* Setup default font */
if (!p->fontdata && !vc->vc_font.data) { if (!p->fontdata) {
if (!fontname[0] || !(font = find_font(fontname))) if (!fontname[0] || !(font = find_font(fontname)))
font = get_default_font(info->var.xres, font = get_default_font(info->var.xres,
info->var.yres, info->var.yres,
...@@ -968,8 +968,6 @@ static const char *fbcon_startup(void) ...@@ -968,8 +968,6 @@ static const char *fbcon_startup(void)
vc->vc_font.height = font->height; vc->vc_font.height = font->height;
vc->vc_font.data = (void *)(p->fontdata = font->data); vc->vc_font.data = (void *)(p->fontdata = font->data);
vc->vc_font.charcount = font->charcount; vc->vc_font.charcount = font->charcount;
} else {
p->fontdata = vc->vc_font.data;
} }
cols = FBCON_SWAP(ops->rotate, info->var.xres, info->var.yres); cols = FBCON_SWAP(ops->rotate, info->var.xres, info->var.yres);
...@@ -1135,9 +1133,9 @@ static void fbcon_init(struct vc_data *vc, int init) ...@@ -1135,9 +1133,9 @@ static void fbcon_init(struct vc_data *vc, int init)
ops->p = &fb_display[fg_console]; ops->p = &fb_display[fg_console];
} }
static void fbcon_free_font(struct fbcon_display *p, bool freefont) static void fbcon_free_font(struct fbcon_display *p)
{ {
if (freefont && p->userfont && p->fontdata && (--REFCOUNT(p->fontdata) == 0)) if (p->userfont && p->fontdata && (--REFCOUNT(p->fontdata) == 0))
kfree(p->fontdata - FONT_EXTRA_WORDS * sizeof(int)); kfree(p->fontdata - FONT_EXTRA_WORDS * sizeof(int));
p->fontdata = NULL; p->fontdata = NULL;
p->userfont = 0; p->userfont = 0;
...@@ -1172,8 +1170,8 @@ static void fbcon_deinit(struct vc_data *vc) ...@@ -1172,8 +1170,8 @@ static void fbcon_deinit(struct vc_data *vc)
struct fb_info *info; struct fb_info *info;
struct fbcon_ops *ops; struct fbcon_ops *ops;
int idx; int idx;
bool free_font = true;
fbcon_free_font(p);
idx = con2fb_map[vc->vc_num]; idx = con2fb_map[vc->vc_num];
if (idx == -1) if (idx == -1)
...@@ -1184,8 +1182,6 @@ static void fbcon_deinit(struct vc_data *vc) ...@@ -1184,8 +1182,6 @@ static void fbcon_deinit(struct vc_data *vc)
if (!info) if (!info)
goto finished; goto finished;
if (info->flags & FBINFO_MISC_FIRMWARE)
free_font = false;
ops = info->fbcon_par; ops = info->fbcon_par;
if (!ops) if (!ops)
...@@ -1197,9 +1193,8 @@ static void fbcon_deinit(struct vc_data *vc) ...@@ -1197,9 +1193,8 @@ static void fbcon_deinit(struct vc_data *vc)
ops->initialized = false; ops->initialized = false;
finished: finished:
fbcon_free_font(p, free_font); fbcon_free_font(p);
if (free_font) vc->vc_font.data = NULL;
vc->vc_font.data = NULL;
if (vc->vc_hi_font_mask && vc->vc_screenbuf) if (vc->vc_hi_font_mask && vc->vc_screenbuf)
set_vc_hi_font(vc, false); set_vc_hi_font(vc, false);
......
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