VT: Support >32x32 fonts for hidpi displays
Subsystems (8)
cover VT: Support >32x32 fonts for hidpi displays
Hello,
This patch series adds to Linux and kbd the support for fonts larger than 32x32 by dropping the oldish VGA constraints that don't apply to fb-based consoles.
Samuel
PATCH 1/3 VT: Add height parameter to con_font_get/set consw operations
The current con_font_get/set API currently hardcodes a 32-pixel-tall limitation, which only dates from the old VGA hardware which could not handle taller fonts than that.
This change just adds a vpitch parameter to release this constraint. Drivers which do not support vpitch != 32 can just return EINVAL when it is not 32, font loading tools will revert to trying 32 and succeed.
This change makes the fbcon driver consider vpitch appropriately, thus making it able to load large fonts.
drivers/tty/vt/vt.c +2 -2
@@ -4604,7 +4604,7 @@ static int con_font_get(struct vc_data *if (vc->vc_mode !=KD_TEXT ) rc = -EINVAL ;else if (vc->vc_sw->con_font_get) - rc = vc->vc_sw->con_font_get (vc, &font); + rc = vc->vc_sw->con_font_get (vc, &font,32 );else rc = -ENOSYS ;console_unlock ();
@@ -4665,7 +4665,7 @@ static int con_font_set(struct vc_data *else if (vc->vc_sw->con_font_set) {if (vc_is_sel (vc))clear_selection (); - rc = vc->vc_sw->con_font_set (vc, &font, op->flags); + rc = vc->vc_sw->con_font_set (vc, &font,32 , op->flags); }else rc = -ENOSYS ;console_unlock ();
drivers/usb/misc/sisusbvga/sisusb_con.c +7 -4
@@ -1198,12 +1198,13 @@ font_op_error:/* Interface routine */ static int sisusbcon_font_set (struct vc_data *c,struct console_font *font, -unsigned int flags) +unsigned int vpitch,unsigned int flags) {struct sisusb_usb_data *sisusb;unsigned charcount = font->charcount; -if (font->width !=8 || (charcount !=256 && charcount !=512 )) +if (font->width !=8 || vpitch !=32 || + (charcount !=256 && charcount !=512 ))return -EINVAL ; sisusb =sisusb_get_sisusb_lock_and_check (c->vc_num);
@@ -1243,13 +1244,15 @@ sisusbcon_font_set(struct vc_data *c, st/* Interface routine */ static int -sisusbcon_font_get (struct vc_data *c,struct console_font *font) +sisusbcon_font_get (struct vc_data *c,struct console_font *font,unsigned int vpitch) {struct sisusb_usb_data *sisusb; sisusb =sisusb_get_sisusb_lock_and_check (c->vc_num);if (!sisusb)return -ENODEV ; +if (vpitch !=32 ) +return -EINVAL ;/* sisusb->lock is down */
@@ -1268,7 +1271,7 @@ sisusbcon_font_get(struct vc_data *c, st }/* Copy 256 chars only, like vgacon */ -memcpy (font->data, sisusb->font_backup,256 *32 ); +memcpy (font->data, sisusb->font_backup,256 * height);mutex_unlock (&sisusb->lock);
drivers/video/console/vgacon.c +4 -4
@@ -1029,7 +1029,7 @@ static int vgacon_adjust_height(struct v }static int vgacon_font_set (struct vc_data *c,struct console_font *font, -unsigned int flags) +unsigned int vpitch,unsigned int flags) {unsigned charcount = font->charcount;int rc;
@@ -1037,7 +1037,7 @@ static int vgacon_font_set(struct vc_datif (vga_video_type <VIDEO_TYPE_EGAM )return -EINVAL ; -if (font->width !=VGA_FONTWIDTH || +if (font->width !=VGA_FONTWIDTH || vpitch !=32 || (charcount !=256 && charcount !=512 ))return -EINVAL ;
@@ -1050,9 +1050,9 @@ static int vgacon_font_set(struct vc_datreturn rc; } -static int vgacon_font_get (struct vc_data *c,struct console_font *font) +static int vgacon_font_get (struct vc_data *c,struct console_font *font,unsigned int vpitch) { -if (vga_video_type <VIDEO_TYPE_EGAM ) +if (vga_video_type <VIDEO_TYPE_EGAM || vpitch !=32 )return -EINVAL ; font->width =VGA_FONTWIDTH ;
drivers/video/fbdev/core/fbcon.c +13 -20
@@ -2271,7 +2271,7 @@ static int fbcon_debug_leave(struct vc_dreturn 0 ; } -static int fbcon_get_font (struct vc_data *vc,struct console_font *font) +static int fbcon_get_font (struct vc_data *vc,struct console_font *font,unsigned int vpitch) {u8 *fontdata = vc->vc_font.data;u8 *data = font->data;
@@ -2290,8 +2290,8 @@ static int fbcon_get_font(struct vc_datafor (i =0 ; i < font->charcount; i++) {memcpy (data, fontdata, j); -memset (data + j,0 ,32 - j); - data +=32 ; +memset (data + j,0 , vpitch - j); + data += vpitch; fontdata += j; } }else if (font->width <=16 ) {
@@ -2301,8 +2301,8 @@ static int fbcon_get_font(struct vc_datafor (i =0 ; i < font->charcount; i++) {memcpy (data, fontdata, j); -memset (data + j,0 ,64 - j); - data +=64 ; +memset (data + j,0 ,2 *vpitch - j); + data +=2 *vpitch; fontdata += j; } }else if (font->width <=24 ) {
@@ -2316,8 +2316,8 @@ static int fbcon_get_font(struct vc_data *data++ = fontdata[2 ]; fontdata +=sizeof (u32); } -memset (data,0 ,3 * (32 - j)); - data +=3 * (32 - j); +memset (data,0 ,3 * (vpitch - j)); + data +=3 * (vpitch - j); } }else { j = vc->vc_font.height *4 ;
@@ -2326,8 +2326,8 @@ static int fbcon_get_font(struct vc_datafor (i =0 ; i < font->charcount; i++) {memcpy (data, fontdata, j); -memset (data + j,0 ,128 - j); - data +=128 ; +memset (data + j,0 ,4 * vpitch - j); + data +=4 * vpitch; fontdata += j; } }
@@ -2461,19 +2461,12 @@ err_out: }/* -* User asked to set font; we are guaranteed that -* a) width and height are in range 1..32 -* b) charcount does not exceed 512 -* but lets not assume that, since someone might someday want to use larger -* fonts. And charcount of 512 is small for unicode support. -* -* However, user space gives the font in 32 rows , regardless of -* actual font height. So a new API is needed if support for larger fonts -* is ever implemented. +* User asked to set font; we are guaranteed that charcount does not exceed 512 +* but lets not assume that, since charcount of 512 is small for unicode support. */ static int fbcon_set_font (struct vc_data *vc,struct console_font *font, -unsigned int flags) +unsigned int vpitch,unsigned int flags) {struct fb_info *info =fbcon_info_from_console (vc->vc_num);unsigned charcount = font->charcount;
@@ -2516,7 +2509,7 @@ static int fbcon_set_font(struct vc_dataFNTSIZE (new_data) = size;REFCOUNT (new_data) =0 ;/* usage counter */ for (i=0 ; i< charcount; i++) { -memcpy (new_data + i*h*pitch, data + i*32 *pitch, h*pitch); +memcpy (new_data + i*h*pitch, data + i*vpitch*pitch, h*pitch); }/* Since linux has a nice crc32 function use it for counting font
include/linux/console.h +3 -2
@@ -58,8 +58,9 @@ struct consw {int (*con_switch)(struct vc_data *vc);int (*con_blank)(struct vc_data *vc,int blank,int mode_switch);int (*con_font_set)(struct vc_data *vc,struct console_font *font, -unsigned int flags); -int (*con_font_get)(struct vc_data *vc,struct console_font *font); +unsigned int vpitch,unsigned int flags); +int (*con_font_get)(struct vc_data *vc,struct console_font *font, +unsigned int vpitch);int (*con_font_default)(struct vc_data *vc,struct console_font *font,char *name); int (*con_resize)(struct vc_data *vc, unsigned int width,
drivers/video/console/newport_con.c +5 -4
@@ -497,7 +497,7 @@ static int newport_blank(struct vc_datareturn 1 ; } -static int newport_set_font (int unit,struct console_font *op) +static int newport_set_font (int unit,struct console_font *op,unsigned int vpitch) {int w = op->width;int h = op->height;
@@ -507,7 +507,7 @@ static int newport_set_font(int unit, st/* ladis: when I grow up, there will be a day... and more sizes will * be supported ;-) */ -if ((w !=8 ) || (h !=16 ) +if ((w !=8 ) || (h !=16 ) || (vpitch !=32 ) || (op->charcount !=256 && op->charcount !=512 ))return -EINVAL ;
@@ -569,9 +569,10 @@ static int newport_font_default(struct vreturn newport_set_def_font (vc->vc_num, op); } -static int newport_font_set (struct vc_data *vc,struct console_font *font,unsigned flags) +static int newport_font_set (struct vc_data *vc,struct console_font *font, +unsigned int vpitch,unsigned int flags) { -return newport_set_font (vc->vc_num, font); +return newport_set_font (vc->vc_num, font, vpitch); } static bool newport_scroll(struct vc_data *vc, unsigned int t, unsigned int b,
drivers/video/console/sticon.c +5 -4
@@ -169,7 +169,8 @@ static int sticon_set_def_font(int unit,return 0 ; } -static int sticon_set_font (struct vc_data *vc,struct console_font *op) +static int sticon_set_font (struct vc_data *vc,struct console_font *op, +unsigned int vpitch) {struct sti_struct *sti = sticon_sti;int vc_cols, vc_rows, vc_old_cols, vc_old_rows;
@@ -181,7 +182,7 @@ static int sticon_set_font(struct vc_datstruct sti_cooked_font *cooked_font;unsigned char *data = op->data, *p; -if ((w <6 ) || (h <6 ) || (w >32 ) || (h >32 ) +if ((w <6 ) || (h <6 ) || (w >32 ) || (h >32 ) || (vpitch !=32 ) || (op->charcount !=256 && op->charcount !=512 ))return -EINVAL ; pitch =ALIGN (w,8 ) /8 ;
@@ -267,9 +268,9 @@ static int sticon_font_default(struct vc }static int sticon_font_set (struct vc_data *vc,struct console_font *font, -unsigned int flags) +unsigned int vpitch,unsigned int flags) { -return sticon_set_font (vc, font); +return sticon_set_font (vc, font, vpitch); }static void sticon_init (struct vc_data *c,int init)
Jiri Slaby
maintainerRe: [patch 1/3] VT: Add height parameter to con_font_get/set consw operations
Quoted 14 lines · Samuel Thibault
The current con_font_get/set API currently hardcodes a 32-pixel-tall limitation, which only dates from the old VGA hardware which could not handle taller fonts than that.
This change just adds a vpitch parameter to release this constraint. Drivers which do not support vpitch != 32 can just return EINVAL when it is not 32, font loading tools will revert to trying 32 and succeed.
This change makes the fbcon driver consider vpitch appropriately, thus making it able to load large fonts.
Signed-off-by Samuel Thibault <[email protected]>
...
Quoted 2 lines
drivers/usb/misc/sisusbvga/sisusb_con.c +0
-0
...
Quoted 18 lines
drivers/usb/misc/sisusbvga/sisusb_con.c +3
-1@@ -1243,13 +1244,15 @@ sisusbcon_font_set(struct vc_data *c, st/* Interface routine */ static int -sisusbcon_font_get (struct vc_data *c,struct console_font *font) +sisusbcon_font_get (struct vc_data *c,struct console_font *font,unsigned int vpitch) {struct sisusb_usb_data *sisusb; sisusb =sisusb_get_sisusb_lock_and_check (c->vc_num);if (!sisusb)return -ENODEV ; +if (vpitch !=32 ) +return -EINVAL ;/* sisusb->lock is down */
drivers/usb/misc/sisusbvga/sisusb_con.c sisusbcon_font_get(struct vc_data *c, st · line 1274
Quoted 5 lines
drivers/usb/misc/sisusbvga/sisusb_con.c +1
-1@@ -1268,7 +1271,7 @@ sisusbcon_font_get(struct vc_data *c, st }/* Copy 256 chars only, like vgacon */ -memcpy (font->data, sisusb->font_backup,256 *32 ); +memcpy (font->data, sisusb->font_backup,256 * height);
Have you tested this? What does this 'height' refer to?
thanks,
Signature · 2 lines
js suse labs
Re: [patch 1/3] VT: Add height parameter to con_font_get/set consw operations
Jiri Slaby, le mar. 06 déc. 2022 07:40:30 +0100, a ecrit:
Quoted 11 lines · Samuel Thibault
Quoted 2 lines
drivers/usb/misc/sisusbvga/sisusb_con.c +0
-0...
drivers/usb/misc/sisusbvga/sisusb_con.c sisusbcon_font_get(struct vc_data *c, st · line 1273
Quoted 5 lines
drivers/usb/misc/sisusbvga/sisusb_con.c +1
-1@@ -1268,7 +1271,7 @@ sisusbcon_font_get(struct vc_data *c, st }/* Copy 256 chars only, like vgacon */ -memcpy (font->data, sisusb->font_backup,256 *32 ); +memcpy (font->data, sisusb->font_backup,256 * height);Have you tested this?
Ah, no, I had assumed that this was for a specific arch. But actually I wasn't getting it because it depends on BROKEN.
Quoted 1 line
What does this 'height' refer to?
It was meant to be vpitch actually, I will fix it.
Samuel
Jiri Slaby
maintainerRe: [patch 1/3] VT: Add height parameter to con_font_get/set consw operations
Quoted 13 lines · Samuel Thibault
Jiri Slaby, le mar. 06 déc. 2022 07:40:30 +0100, a ecrit:
Quoted 11 lines · Samuel Thibault
Quoted 2 lines
drivers/usb/misc/sisusbvga/sisusb_con.c +0
-0...
drivers/usb/misc/sisusbvga/sisusb_con.c sisusbcon_font_get(struct vc_data *c, st · line 1273
Quoted 5 lines
drivers/usb/misc/sisusbvga/sisusb_con.c +1
-1@@ -1268,7 +1271,7 @@ sisusbcon_font_get(struct vc_data *c, st }/* Copy 256 chars only, like vgacon */ -memcpy (font->data, sisusb->font_backup,256 *32 ); +memcpy (font->data, sisusb->font_backup,256 * height);Have you tested this?
Quoted 2 lines
Ah, no, I had assumed that this was for a specific arch. But actually I wasn't getting it because it depends on BROKEN.
Hmm, for two years... I will remove the con support completely next week if noone beats me to it.
thanks,
Signature · 2 lines
js suse labs
Greg Kroah-Hartman
maintainerRe: [patch 1/3] VT: Add height parameter to con_font_get/set consw operations
Quoted 14 lines · Jiri Slaby
Quoted 13 lines · Samuel Thibault
Jiri Slaby, le mar. 06 déc. 2022 07:40:30 +0100, a ecrit:
Quoted 11 lines · Samuel Thibault
Quoted 2 lines
drivers/usb/misc/sisusbvga/sisusb_con.c +0
-0...
drivers/usb/misc/sisusbvga/sisusb_con.c sisusbcon_font_get(struct vc_data *c, st · line 1273
Quoted 5 lines
drivers/usb/misc/sisusbvga/sisusb_con.c +1
-1@@ -1268,7 +1271,7 @@ sisusbcon_font_get(struct vc_data *c, st }/* Copy 256 chars only, like vgacon */ -memcpy (font->data, sisusb->font_backup,256 *32 ); +memcpy (font->data, sisusb->font_backup,256 * height);Have you tested this?
Quoted 5 lines
Quoted 2 lines
Ah, no, I had assumed that this was for a specific arch. But actually I wasn't getting it because it depends on BROKEN.
Hmm, for two years... I will remove the con support completely next week if noone beats me to it.
If you do it this week we can get it into 6.2 :)
PATCH 2/3 VT: Add KD_FONT_OP_SET/GET_TALL operations
In reply to Samuel ThibaultThe KD_FONT_OP_SET/GET operations hardcode vpitch to be 32 pixels, which only dates from the old VGA hardware which as asserting this.
Drivers such as fbcon however do not have such limitation, so this introduces KD_FONT_OP_SET/GET_TALL operations, which userland can try to use to avoid this limitation, thus opening the patch to >32 pixels font height.
drivers/tty/vt/vt.c +10 -4
@@ -4592,6 +4592,7 @@ static int con_font_get(struct vc_data *struct console_font font;int rc = -EINVAL ;int c; +unsigned int vpitch = op->op ==KD_FONT_OP_GET_TALL ? op->height :32 ;if (op->data) { font.data =kmalloc (max_font_size,GFP_KERNEL );
@@ -4604,7 +4605,7 @@ static int con_font_get(struct vc_data *if (vc->vc_mode !=KD_TEXT ) rc = -EINVAL ;else if (vc->vc_sw->con_font_get) - rc = vc->vc_sw->con_font_get (vc, &font,32 ); + rc = vc->vc_sw->con_font_get (vc, &font, vpitch);else rc = -ENOSYS ;console_unlock ();
@@ -4612,7 +4613,7 @@ static int con_font_get(struct vc_data *if (rc) goto out; - c = (font.width+7 )/8 *32 * font.charcount; + c = (font.width+7 )/8 * vpitch * font.charcount;if (op->data && font.charcount > op->charcount) rc = -ENOSPC ;
@@ -4638,6 +4639,7 @@ static int con_font_set(struct vc_data *struct console_font font;int rc = -EINVAL ;int size; +unsigned int vpitch = op->op ==KD_FONT_OP_SET_TALL ? op->height :32 ;if (vc->vc_mode !=KD_TEXT )return -EINVAL ;
@@ -4647,7 +4649,9 @@ static int con_font_set(struct vc_data *return -EINVAL ;if (op->width <=0 || op->width >32 || !op->height || op->height >32 )return -EINVAL ; - size = (op->width+7 )/8 *32 * op->charcount; +if (vpitch < op->height) +return -EINVAL ; + size = (op->width+7 )/8 * vpitch * op->charcount;if (size > max_font_size)return -ENOSPC ;
@@ -4665,7 +4669,7 @@ static int con_font_set(struct vc_data *else if (vc->vc_sw->con_font_set) {if (vc_is_sel (vc))clear_selection (); - rc = vc->vc_sw->con_font_set (vc, &font,32 , op->flags); + rc = vc->vc_sw->con_font_set (vc, &font, vpitch, op->flags); }else rc = -ENOSYS ;console_unlock ();
@@ -4711,8 +4715,10 @@ int con_font_op(struct vc_data *vc, stru {switch (op->op) {case KD_FONT_OP_SET : +case KD_FONT_OP_SET_TALL :return con_font_set (vc, op);case KD_FONT_OP_GET : +case KD_FONT_OP_GET_TALL :return con_font_get (vc, op);case KD_FONT_OP_SET_DEFAULT :return con_font_default (vc, op);
include/uapi/linux/kd.h +8 -2
@@ -161,19 +161,25 @@ struct console_font_op {unsigned int flags;/* KD_FONT_FLAG_* */ unsigned int width, height;/* font size */ unsigned int charcount; -unsigned char __user *data;/* font data with height fixed to 32 */ +unsigned char __user *data;/* font data with vpitch fixed to 32 for +* KD_FONT_OP_SET/GET +*/ };struct console_font {unsigned int width, height;/* font size */ unsigned int charcount; -unsigned char *data;/* font data with height fixed to 32 */ +unsigned char *data;/* font data with vpitch fixed to 32 for +* KD_FONT_OP_SET/GET +*/ };#define KD_FONT_OP_SET 0/* Set font */ #define KD_FONT_OP_GET 1/* Get font */ #define KD_FONT_OP_SET_DEFAULT 2/* Set font to default, data points to name / NULL */ #define KD_FONT_OP_COPY 3/* Obsolete, do not use */ +#define KD_FONT_OP_SET_TALL 4/* Set font with vpitch = height */ +#define KD_FONT_OP_GET_TALL 5/* Get font with vpitch = height */ #define KD_FONT_FLAG_DONT_RECALC 1/* Don't recalculate hw charcell size [compat] */
PATCH 3/3 VT: Bump font size limitation to 64x128 pixels
In reply to Samuel ThibaultThis moves 32x32 font size limitation checking down to drivers, so that fbcon can allow large fonts.
We still keep a limitation to 64x128 pixels so as to have a simple bounded allocation for con_font_get and in the userland kbd tool. That glyph size will however be enough to have 128x36 characters on a "16/9 8K display".
drivers/tty/vt/vt.c +14 -10
@@ -4575,17 +4575,20 @@ void reset_palette(struct vc_data *vc)/* * Font switching * -* Currently we only support fonts up to 32 pixels wide, at a maximum height -* of 32 pixels. Userspace fontdata is stored with 32 bytes (shorts/ints, -* depending on width) reserved for each character which is kinda wasty, but -* this is done in order to maintain compatibility with the EGA/VGA fonts. It -* is up to the actual low-level console-driver convert data into its favorite -* format (maybe we should add a `fontoffset' field to the `display' -* structure so we won't have to convert the fontdata all the time. +* Currently we only support fonts up to 128 pixels wide, at a maximum height +* of 128 pixels. Userspace fontdata may have to be stored with 32 bytes +* (shorts/ints, depending on width) reserved for each character which is +* kinda wasty, but this is done in order to maintain compatibility with the +* EGA/VGA fonts. It is up to the actual low-level console-driver convert data +* into its favorite format (maybe we should add a `fontoffset' field to the +* `display' structure so we won't have to convert the fontdata all the time. * /Jes */ -#define max_font_size 65536 +#define max_font_width 64 +#define max_font_height 128 +#define max_font_glyphs 512 +#define max_font_size (max_font_glyphs*max_font_width*max_font_height)static int con_font_get (struct vc_data *vc,struct console_font_op *op) {
@@ -4645,9 +4648,10 @@ static int con_font_set(struct vc_data *return -EINVAL ;if (!op->data)return -EINVAL ; -if (op->charcount >512 ) +if (op->charcount > max_font_glyphs)return -EINVAL ; -if (op->width <=0 || op->width >32 || !op->height || op->height >32 ) +if (op->width <=0 || op->width > max_font_width || !op->height || + op->height > max_font_height)return -EINVAL ;if (vpitch < op->height)return -EINVAL ;
drivers/usb/misc/sisusbvga/sisusb_con.c +1 -1
@@ -1203,7 +1203,7 @@ sisusbcon_font_set(struct vc_data *c, ststruct sisusb_usb_data *sisusb;unsigned charcount = font->charcount; -if (font->width !=8 || vpitch !=32 || +if (font->width !=8 || font->height >32 || vpitch !=32 || (charcount !=256 && charcount !=512 ))return -EINVAL ;
drivers/video/console/vgacon.c +1 -1
@@ -1037,7 +1037,7 @@ static int vgacon_font_set(struct vc_datif (vga_video_type <VIDEO_TYPE_EGAM )return -EINVAL ; -if (font->width !=VGA_FONTWIDTH || vpitch !=32 || +if (font->width !=VGA_FONTWIDTH || font->height >32 || vpitch !=32 || (charcount !=256 && charcount !=512 ))return -EINVAL ;
drivers/video/fbdev/core/fbcon.c +2 -0
@@ -2279,6 +2279,8 @@ static int fbcon_get_font(struct vc_data font->width = vc->vc_font.width; font->height = vc->vc_font.height; +if (font->height > vpitch) +return -ENOSPC ; font->charcount = vc->vc_hi_font_mask ?512 :256 ;if (!font->data)return 0 ;
Jiri Slaby
maintainerRe: [patch 3/3] VT: Bump font size limitation to 64x128 pixels
Quoted 14 lines · Samuel Thibault
This moves 32x32 font size limitation checking down to drivers, so that fbcon can allow large fonts.
We still keep a limitation to 64x128 pixels so as to have a simple bounded allocation for
con_font_getand in the userland kbd tool. That glyph size will however be enough to have 128x36 characters on a "16/9 8K display".Signed-off-by Samuel Thibault <[email protected]>Index:
linux-6.0/drivers/tty/vt/vt.c
===================================================================drivers/tty/vt/vt.c +0
-0@@ -4575,17 +4575,20 @@ void reset_palette(struct vc_data *vc)
...
drivers/tty/vt/vt.c void reset_palette(struct vc_data *vc) · line 4591
Quoted 5 lines
drivers/tty/vt/vt.c +4
-1-#define max_font_size 65536 +#define max_font_width 64 +#define max_font_height 128 +#define max_font_glyphs 512 +#define max_font_size (max_font_glyphs*max_font_width*max_font_height)
So this is 64K -> 4M switch. We should likely convert to kvmalloc() too.
regards,
Signature · 2 lines
js suse labs
Re: [patch 3/3] VT: Bump font size limitation to 64x128 pixels
Jiri Slaby, le mar. 06 déc. 2022 07:48:37 +0100, a ecrit:
Quoted 16 lines · Samuel Thibault
Quoted 14 lines
This moves 32x32 font size limitation checking down to drivers, so that fbcon can allow large fonts.
We still keep a limitation to 64x128 pixels so as to have a simple bounded allocation for
con_font_getand in the userland kbd tool. That glyph size will however be enough to have 128x36 characters on a "16/9 8K display".Signed-off-by Samuel Thibault <[email protected]>Index:
linux-6.0/drivers/tty/vt/vt.c
===================================================================drivers/tty/vt/vt.c +0
-0@@ -4575,17 +4575,20 @@ void reset_palette(struct vc_data *vc)...
Quoted 7 lines
drivers/tty/vt/vt.c void reset_palette(struct vc_data *vc) · line 4591
Quoted 5 lines
drivers/tty/vt/vt.c +4
-1-#define max_font_size 65536 +#define max_font_width 64 +#define max_font_height 128 +#define max_font_glyphs 512 +#define max_font_size (max_font_glyphs*max_font_width*max_font_height)So this is 64K -> 4M switch. We should likely convert to
kvmalloc()too.
Oh, indeed, I'll fix that as well.
Thanks,
Samuel
PATCH 1/1 font: Leverage KD_FONT_OP_GET/SET_TALL font operations
In reply to Samuel ThibaultThe new KD_FONT_OP_GET/SET_TALL font operations allow to load fonts taller than 32 pixels by dropping the VGA-specific vertical pitch limitation.
The new maximum font size has thus been raised to 64x128.
We however continue using the older font operations for smaller fonts, to continue supporting older kernels.
src/compat/linux-kd.h +4 -1
@@ -90,7 +90,8 @@ struct console_font_op {unsigned int flags;/* KD_FONT_FLAG_* */ unsigned int width, height;unsigned int charcount; -unsigned char *data;/* font data with height fixed to 32 */ +unsigned char *data;/* font data with vpitch fixed to 32 for +* KD_FONT_OP_SET/GET */ };#define KD_FONT_OP_SET 0/* Set font */
@@ -98,6 +99,8 @@ struct console_font_op {#define KD_FONT_OP_SET_DEFAULT 2/* Set font to default, \ data points to name / NULL */ #define KD_FONT_OP_COPY 3/* Copy from another console */ +#define KD_FONT_OP_SET_TALL 4/* Set font with arbitrary vpitch */ +#define KD_FONT_OP_GET_TALL 5/* Get font with arbitrary vpitch */ #define KD_FONT_FLAG_OLD 0x80000000/* Invoked via old interface */ #define KD_FONT_FLAG_DONT_RECALC 1/* Don't call adjust_height() */
src/libkfont/kdfontop.c +41 -9
105 lines not on this page · raw message
src/libkfont/kfont.h +5 -3
@@ -171,7 +171,8 @@ int kfont_load_unicodemap(struct kfont_c* Sets number of glyphs in COUNT, glyph size in WIDTH and HEIGHT. */ int kfont_get_font (struct kfont_context *ctx,int consolefd,unsigned char *buf, -unsigned int *count,unsigned int *width,unsigned int *height) +unsigned int *count,unsigned int *width,unsigned int *height, +unsigned int *vpitch) __attribute__((nonnull (1 )));/*
@@ -180,7 +181,8 @@ int kfont_get_font(struct kfont_context* Return 0 on success, -1 on failure. */ int kfont_put_font (struct kfont_context *ctx,int consolefd,unsigned char *buf, -unsigned int count,unsigned int width,unsigned int height) +unsigned int count,unsigned int width,unsigned int height, +unsigned int vpitch) __attribute__((nonnull (1 )));/*
@@ -239,7 +241,7 @@ void kfont_disactivatemap(int fd);#include <stdio.h> /* Maximum font size that we try to handle */ -#define MAXFONTSIZE 65536 +#define MAXFONTSIZE (512*64*128)/** * readpsffont reads a PSF font.
src/libkfont/setfont.c +30 -15
105 lines not on this page · raw message
src/showconsolefont.c +1 -1
@@ -205,7 +205,7 @@ int main(int argc, char **argv)if (info) { nr = rows = cols =0 ; - ret =kfont_get_font (kfont, fd,NULL , &nr, &rows, &cols); + ret =kfont_get_font (kfont, fd,NULL , &nr, &rows, &cols,NULL );if (ret !=0 )leave (kfont,EXIT_FAILURE );
tests/libtswrap/ioctl.c +6 -0
@@ -93,6 +93,12 @@ static struct translate_names kd_font_op { KD_FONT_OP_GET, "KD_FONT_OP_GET" }, { KD_FONT_OP_SET_DEFAULT, "KD_FONT_OP_SET_DEFAULT" }, { KD_FONT_OP_COPY, "KD_FONT_OP_COPY" }, +#ifdef KD_FONT_OP_SET_TALL + { KD_FONT_OP_SET_TALL, "KD_FONT_OP_SET_TALL" }, +#endif +#ifdef KD_FONT_OP_GET_TALL + { KD_FONT_OP_GET_TALL, "KD_FONT_OP_GET_TALL" }, +#endif { 0, NULL } };