From: Alexey Gladkov <legion@kernel.org>
To: LKML <linux-kernel@vger.kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jirislaby@kernel.org>
Cc: linux-api@vger.kernel.org
Subject: [RFC PATCH v2 5/5] fbcon: Allow to get max font width and height
Date: Mon, 26 Feb 2024 16:21:14 +0100 [thread overview]
Message-ID: <ab4ce129aef39b81cd27f10d49142a1c64f87a37.1708960303.git.legion@kernel.org> (raw)
In-Reply-To: <cover.1708960303.git.legion@kernel.org>
Signed-off-by: Alexey Gladkov <legion@kernel.org>
---
drivers/video/fbdev/core/fbcon.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index 1183e7a871f8..055d0d01243c 100644
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/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 32
+#define FBCON_MAX_FONT_HEIGHT 32
+
static struct fbcon_display fb_display[MAX_NR_CONSOLES];
static struct fb_info *fbcon_registered_fb[FB_MAX];
@@ -2458,6 +2461,21 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, int charcount,
return ret;
}
+
+static int fbcon_font_info(struct vc_data *vc, struct console_font_info *info)
+{
+ info->min_width = 0;
+ info->min_height = 0;
+
+ info->max_width = FBCON_MAX_FONT_WIDTH;
+ info->max_height = FBCON_MAX_FONT_HEIGHT;
+
+ info->flags = KD_FONT_INFO_FLAG_LOW_SIZE | KD_FONT_INFO_FLAG_HIGH_SIZE;
+
+ return 0;
+}
+
+
/*
* 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.
@@ -2485,7 +2503,8 @@ static int fbcon_set_font(struct vc_data *vc, struct console_font *font,
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 */
@@ -3160,6 +3179,7 @@ static const struct consw fb_con = {
.con_scroll = fbcon_scroll,
.con_switch = fbcon_switch,
.con_blank = fbcon_blank,
+ .con_font_info = fbcon_font_info,
.con_font_set = fbcon_set_font,
.con_font_get = fbcon_get_font,
.con_font_default = fbcon_set_def_font,
--
2.44.0
next prev parent reply other threads:[~2024-02-26 15:21 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-15 15:37 [RFC PATCH v1 0/5] VT: Add ability to get font requirements Alexey Gladkov
2024-02-15 15:37 ` [RFC PATCH v1 1/5] VT: Add KD_FONT_OP_GET_INFO operation Alexey Gladkov
2024-02-15 15:37 ` [RFC PATCH v1 2/5] newport_con: Allow to get max font width and height Alexey Gladkov
2024-02-15 15:37 ` [RFC PATCH v1 3/5] sticon: " Alexey Gladkov
2024-02-16 7:10 ` Jiri Slaby
2024-02-16 13:03 ` Alexey Gladkov
2024-02-15 15:37 ` [RFC PATCH v1 4/5] vgacon: " Alexey Gladkov
2024-02-15 15:37 ` [RFC PATCH v1 5/5] fbcon: " Alexey Gladkov
2024-02-16 7:21 ` [RFC PATCH v1 0/5] VT: Add ability to get font requirements Jiri Slaby
2024-02-16 13:26 ` Alexey Gladkov
2024-02-16 13:45 ` Samuel Thibault
2024-02-16 14:40 ` Alexey Gladkov
2024-02-21 7:04 ` Jiri Slaby
2024-02-26 15:21 ` [RFC PATCH v2 " Alexey Gladkov
2024-02-26 15:21 ` [RFC PATCH v2 1/5] VT: Add KD_FONT_OP_GET_INFO operation Alexey Gladkov
2024-02-26 15:21 ` [RFC PATCH v2 2/5] newport_con: Allow to get max font width and height Alexey Gladkov
2024-02-26 15:21 ` [RFC PATCH v2 3/5] sticon: " Alexey Gladkov
2024-02-27 5:52 ` Greg Kroah-Hartman
2024-02-27 14:06 ` Alexey Gladkov
2024-02-26 15:21 ` [RFC PATCH v2 4/5] vgacon: " Alexey Gladkov
2024-02-26 15:21 ` Alexey Gladkov [this message]
2024-03-12 14:23 ` [PATCH v3 0/2] VT: Add ability to get font requirements legion
2024-03-12 14:23 ` [PATCH v3 1/2] VT: Add KDFONTINFO ioctl legion
2024-03-15 9:15 ` Helge Deller
2024-03-12 14:23 ` [PATCH v3 2/2] VT: Allow to get max font width and height legion
2024-03-13 17:40 ` Oleg Bulatov
2024-04-02 11:09 ` Jiri Slaby
2024-03-15 9:16 ` Helge Deller
2024-04-02 10:32 ` [RESEND PATCH v3 0/2] VT: Add ability to get font requirements Alexey Gladkov
2024-04-02 10:32 ` [RESEND PATCH v3 1/2] VT: Add KDFONTINFO ioctl Alexey Gladkov
2024-04-02 11:02 ` Jiri Slaby
2024-04-02 13:19 ` Alexey Gladkov
2024-04-03 5:27 ` Jiri Slaby
2024-04-10 16:29 ` Alexey Gladkov
2024-04-10 17:11 ` Greg Kroah-Hartman
2024-04-02 17:50 ` [PATCH v4 0/3] VT: Add ability to get font requirements Alexey Gladkov
2024-04-02 17:50 ` [PATCH v4 1/3] VT: Use macros to define ioctls Alexey Gladkov
2024-04-02 17:50 ` [PATCH v4 2/3] VT: Add KDFONTINFO ioctl Alexey Gladkov
2024-04-03 4:55 ` Greg Kroah-Hartman
2024-04-03 5:05 ` Jiri Slaby
2024-04-10 16:36 ` Alexey Gladkov
2024-04-11 3:53 ` Jiri Slaby
2024-04-02 17:50 ` [PATCH v4 3/3] VT: Allow to get max font width and height Alexey Gladkov
2024-04-17 17:37 ` [PATCH v5 0/3] VT: Add ability to get font requirements Alexey Gladkov
2024-04-17 17:37 ` [PATCH v5 1/3] VT: Use macros to define ioctls Alexey Gladkov
2024-04-18 6:18 ` Greg Kroah-Hartman
2024-04-17 17:37 ` [PATCH v5 2/3] VT: Add KDFONTINFO ioctl Alexey Gladkov
2024-04-17 19:31 ` Helge Deller
2024-04-18 10:45 ` Alexey Gladkov
2024-04-25 10:33 ` Helge Deller
2024-04-25 11:06 ` Alexey Gladkov
2024-04-25 11:35 ` Helge Deller
2024-04-18 6:18 ` Greg Kroah-Hartman
2024-04-18 10:27 ` Alexey Gladkov
2024-04-17 17:37 ` [PATCH v5 3/3] VT: Allow to get max font width and height Alexey Gladkov
2024-04-02 10:32 ` [RESEND PATCH v3 2/2] " Alexey Gladkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ab4ce129aef39b81cd27f10d49142a1c64f87a37.1708960303.git.legion@kernel.org \
--to=legion@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).