lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/5] fbcon: Avoid hard-coding built-in font charcount
    Date
    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(-)

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

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-10-27 17:43    [W:7.400 / U:0.672 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site