summaryrefslogtreecommitdiff
path: root/include/linux/console.h
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2023-01-19 18:19:15 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-01-19 18:28:56 +0300
commitffc1e089725e3f8a15ddfdce283db42f7d0fa147 (patch)
treea12ea38b9de91ce77840411df3cb247537e6101a /include/linux/console.h
parente34a79d0b320ea8248e1ee3482eb5c388a27d303 (diff)
downloadlinux-ffc1e089725e3f8a15ddfdce283db42f7d0fa147.tar.xz
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. Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Link: https://lore.kernel.org/r/20230119151934.932642243@ens-lyon.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/console.h')
-rw-r--r--include/linux/console.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/console.h b/include/linux/console.h
index 9cea254b34b8..9e52de94a583 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -59,8 +59,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,