| Message ID | a3b1b3cdc160fb9aef389c366f387fb27f0aef38.1603788512.git.yepeilin.cs@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Preparation work for using font_desc in vc_data | expand |
On Tue, Oct 27, 2020 at 12:41:02PM -0400, Peilin Ye wrote: > sti_select_fbfont() and sti_cook_fonts() are hard-coding the number of > characters of our built-in fonts as 256. Recently, we included that > information in our kernel font descriptor `struct font_desc`, so use > `fbfont->charcount` instead of hard-coded values. > > This patch depends on patch "Fonts: Add charcount field to font_desc". > > Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > $ # Build-tested (Ubuntu 20.04) > $ sudo apt-get install binutils-hppa64-linux-gnu gcc-7-hppa64-linux-gnu > $ cp arch/parisc/configs/generic-64bit_defconfig .config > $ make -j`nproc` ARCH=parisc CROSS_COMPILE=hppa64-linux-gnu- all > > drivers/video/console/sticore.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c > index d1bb5915082b..f869b723494f 100644 > --- a/drivers/video/console/sticore.c > +++ b/drivers/video/console/sticore.c > @@ -506,7 +506,7 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name) > fbfont->width, fbfont->height, fbfont->name); > > bpc = ((fbfont->width+7)/8) * fbfont->height; > - size = bpc * 256; > + size = bpc * fbfont->charcount; > size += sizeof(struct sti_rom_font); > > nf = kzalloc(size, STI_LOWMEM); > @@ -514,7 +514,7 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name) > return NULL; > > nf->first_char = 0; > - nf->last_char = 255; > + nf->last_char = fbfont->charcount - 1; > nf->width = fbfont->width; > nf->height = fbfont->height; > nf->font_type = STI_FONT_HPROMAN8; > @@ -525,7 +525,7 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name) > > dest = nf; > dest += sizeof(struct sti_rom_font); > - memcpy(dest, fbfont->data, bpc*256); > + memcpy(dest, fbfont->data, bpc * fbfont->charcount); > > cooked_font = kzalloc(sizeof(*cooked_font), GFP_KERNEL); > if (!cooked_font) { > @@ -660,7 +660,7 @@ static int sti_cook_fonts(struct sti_cooked_rom *cooked_rom, > void sti_font_convert_bytemode(struct sti_struct *sti, struct sti_cooked_font *f) > { > unsigned char *n, *p, *q; > - int size = f->raw->bytes_per_char * 256 + sizeof(struct sti_rom_font); > + int size = f->raw->bytes_per_char * (f->raw->last_char + 1) + sizeof(struct sti_rom_font); > struct sti_rom_font *old_font; > > if (sti->wordmode) > -- > 2.25.1 >
On Tue, Oct 27, 2020 at 08:13:53PM +0100, Daniel Vetter wrote: > On Tue, Oct 27, 2020 at 12:37:29PM -0400, Peilin Ye wrote: > > fbcon_startup() and fbcon_init() are hard-coding the number of characters > > of our built-in fonts as 256. Recently, we included that information in > > our kernel font descriptor `struct font_desc`, so use `font->charcount` > > instead of a hard-coded value. > > > > This patch depends on patch "Fonts: Add charcount field to font_desc". > > > > Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com> > > So I think this is correct, but it also doesn't do a hole lot yet. fbcon.c > still has tons of hard-coded 256 all over, and if (p->userfont). > > I think if we instead set vc->vc_font.charcount both in fbcon_init and in > fbcon_do_set_font (probably just replace the userfont parameter with > font_charcount for now), then we could replace these all with > vc->vc_font.charcount. And the code would already improve quite a bit I > think. > > With just this change here I think we have even more inconsistency, since > for built-in fonts vc->vc_font.charcount is now set correctly, but for > userfonts we need to instead look at FNTCHARCNT(vc->vc_font.data). You are right, let's remove FNTCHARCNT() altogether. fbcon_do_set_font() still needs a userfont parameter for refcount handling, I'll just add a charcount parameter to it. Peilin
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index cef437817b0d..e563847991b7 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -1004,7 +1004,7 @@ static const char *fbcon_startup(void) vc->vc_font.width = font->width; vc->vc_font.height = font->height; vc->vc_font.data = (void *)(p->fontdata = font->data); - vc->vc_font.charcount = 256; /* FIXME Need to support more fonts */ + vc->vc_font.charcount = font->charcount; } else { p->fontdata = vc->vc_font.data; } @@ -1083,8 +1083,7 @@ static void fbcon_init(struct vc_data *vc, int init) vc->vc_font.width = font->width; vc->vc_font.height = font->height; vc->vc_font.data = (void *)(p->fontdata = font->data); - vc->vc_font.charcount = 256; /* FIXME Need to - support more fonts */ + vc->vc_font.charcount = font->charcount; } }
fbcon_startup() and fbcon_init() are hard-coding the number of characters of our built-in fonts as 256. Recently, we included that information in our kernel font descriptor `struct font_desc`, so use `font->charcount` instead of a hard-coded value. This patch depends on patch "Fonts: Add charcount field to font_desc". Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com> --- drivers/video/fbdev/core/fbcon.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)