This remains relatively simple by just enlarging integers.
It wouldn't be that simple to get to the console's 64x128 maximum, as it would
require 128b integers.
Signed-off-by: Samuel Thibault <[email protected]>
Index: linux-6.4/drivers/video/fbdev/core/fbcon.c
===================================================================
--- linux-6.4.orig/drivers/video/fbdev/core/fbcon.c
+++ linux-6.4/drivers/video/fbdev/core/fbcon.c
@@ -101,6 +101,9 @@ enum {
FBCON_LOGO_DONTSHOW = -3 /* do not show the logo */
};
+#define FBCON_MAX_FONT_WIDTH (sizeof(((struct fb_pixmap *) 0)->blit_x) * 8)
+#define FBCON_MAX_FONT_HEIGHT (sizeof(((struct fb_pixmap *) 0)->blit_y) * 8)
+
static struct fbcon_display fb_display[MAX_NR_CONSOLES];
struct fb_info *fbcon_registered_fb[FB_MAX];
@@ -2485,12 +2488,12 @@ static int fbcon_set_font(struct vc_data
h > FBCON_SWAP(info->var.rotate, info->var.yres, info->var.xres))
return -EINVAL;
- if (font->width > 32 || font->height > 32)
+ if (font->width > FBCON_MAX_FONT_WIDTH || font->height > FBCON_MAX_FONT_HEIGHT)
return -EINVAL;
/* Make sure drawing engine can handle the font */
- if (!(info->pixmap.blit_x & BIT(font->width - 1)) ||
- !(info->pixmap.blit_y & BIT(font->height - 1)))
+ if (!(info->pixmap.blit_x & BIT_ULL(font->width - 1)) ||
+ !(info->pixmap.blit_y & BIT_ULL(font->height - 1)))
return -EINVAL;
/* Make sure driver can handle the font length */
@@ -3084,8 +3087,8 @@ void fbcon_get_requirement(struct fb_inf
vc = vc_cons[i].d;
if (vc && vc->vc_mode == KD_TEXT &&
info->node == con2fb_map[i]) {
- caps->x |= 1 << (vc->vc_font.width - 1);
- caps->y |= 1 << (vc->vc_font.height - 1);
+ caps->x |= 1ULL << (vc->vc_font.width - 1);
+ caps->y |= 1ULL << (vc->vc_font.height - 1);
charcnt = vc->vc_font.charcount;
if (caps->len < charcnt)
caps->len = charcnt;
@@ -3096,8 +3099,8 @@ void fbcon_get_requirement(struct fb_inf
if (vc && vc->vc_mode == KD_TEXT &&
info->node == con2fb_map[fg_console]) {
- caps->x = 1 << (vc->vc_font.width - 1);
- caps->y = 1 << (vc->vc_font.height - 1);
+ caps->x = 1ULL << (vc->vc_font.width - 1);
+ caps->y = 1ULL << (vc->vc_font.height - 1);
caps->len = vc->vc_font.charcount;
}
}
Index: linux-6.4/include/linux/fb.h
===================================================================
--- linux-6.4.orig/include/linux/fb.h
+++ linux-6.4/include/linux/fb.h
@@ -143,8 +143,8 @@ struct fb_event {
};
struct fb_blit_caps {
- u32 x;
- u32 y;
+ u64 x;
+ u64 y;
u32 len;
u32 flags;
};
@@ -191,10 +191,10 @@ struct fb_pixmap {
u32 scan_align; /* alignment per scanline */
u32 access_align; /* alignment per read/write (bits) */
u32 flags; /* see FB_PIXMAP_* */
- u32 blit_x; /* supported bit block dimensions (1-32)*/
- u32 blit_y; /* Format: blit_x = 1 << (width - 1) */
+ u64 blit_x; /* supported bit block dimensions (1-64)*/
+ u64 blit_y; /* Format: blit_x = 1 << (width - 1) */
/* blit_y = 1 << (height - 1) */
- /* if 0, will be set to 0xffffffff (all)*/
+ /* if 0, will be set to ~0ull (all) */
/* access methods */
void (*writeio)(struct fb_info *info, void __iomem *dst, void *src, unsigned int size);
void (*readio) (struct fb_info *info, void *dst, void __iomem *src, unsigned int size);
Hello Samuel,
On Tue, 12 Mar 2024 22:39:02 +0100
Samuel Thibault <[email protected]> wrote:
> This remains relatively simple by just enlarging integers.
>
> It wouldn't be that simple to get to the console's 64x128 maximum, as it would
> require 128b integers.
>
> Signed-off-by: Samuel Thibault <[email protected]>
>
> Index: linux-6.4/drivers/video/fbdev/core/fbcon.c
> ===================================================================
This patch is clearly not formatted according to the standard format
and it does not apply with 'git am'.
Using 'git format-patch' and 'git send-email' is *very* recommended as
it will take care of all the formatting for you. Maintainers and
anybody interested in your patch will be able to apply it easily.
All the info you need are at
https://docs.kernel.org/process/submitting-patches.html
> --- linux-6.4.orig/drivers/video/fbdev/core/fbcon.c
> +++ linux-6.4/drivers/video/fbdev/core/fbcon.c
Apparently you are not using git to track your changes, so I recommend
using it to have all the git utilities available.
Best regards,
Luca
--
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Luca Ceresoli, le mer. 13 mars 2024 17:45:31 +0100, a ecrit:
> Using 'git format-patch' and 'git send-email' is *very* recommended as
> it will take care of all the formatting for you.
It's quite a pitty that git cannot simply consume the output of diff.
Now I'll have to download 8GB of linux tree only for a simple patch...
Samuel
Luca Ceresoli, le mer. 13 mars 2024 17:45:31 +0100, a ecrit:
> This patch is clearly not formatted according to the standard format
> and it does not apply with 'git am'.
(Note: the failure of application was not related to the formatting at
all, but just a little fuzz for the static word in
static struct fb_info *fbcon_registered_fb[FB_MAX];
that git doesn't seem to be able to just cope with)
Samuel