Merge tag 'fbdev-for-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev
Pull fbdev updates from Helge Deller: "A major refactorization by Thomas Zimmermann from SUSE regarding handling of console font data, addition of helpers for console font rotation and split into individual components for glyphs, fonts and the overall fbcon state. And there is the round of usual code cleanups and fixes: Cleanups: - atyfb: Remove unused fb_list (Geert Uytterhoeven) - goldfishfb, wmt_ge_rops: use devm_platform_ioremap_resource() (Amin GATTOUT) - matroxfb: Mark variable with __maybe_unused (Andy Shevchenko) - omapfb: Add missing error check for clk_get() (Chen Ni) - tdfxfb: Make the VGA register initialisation a bit more obvious (Daniel Palmer) - macfb: Replace deprecated strcpy with strscpy (Thorsten Blum) Fixes: - tdfxfb, udlfb: avoid divide-by-zero on FBIOPUT_VSCREENINFO (Greg Kroah-Hartman) - omap2: fix inconsistent lock returns in omapfb_mmap (Hongling Zeng) - viafb: check ioremap return value in viafb_lcd_get_mobile_state (Wang Jun)" * tag 'fbdev-for-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: (40 commits) fbdev: udlfb: avoid divide-by-zero on FBIOPUT_VSCREENINFO fbdev: tdfxfb: avoid divide-by-zero on FBIOPUT_VSCREENINFO fbdev: omap2: fix inconsistent lock returns in omapfb_mmap MAINTAINERS: Add dedicated entry for fbcon fbcon: Put font-rotation state into separate struct fbcon: Fill cursor mask in helper function lib/fonts: Implement font rotation lib/fonts: Refactor glyph-rotation helpers lib/fonts: Refactor glyph-pattern helpers lib/fonts: Implement glyph rotation lib/fonts: Clean up Makefile lib/fonts: Provide helpers for calculating glyph pitch and size vt: Implement helpers for struct vc_font in source file fbcon: Avoid OOB font access if console rotation fails fbdev: atyfb: Remove unused fb_list fbdev: matroxfb: Mark variable with __maybe_unused to avoid W=1 build break fbdev: update help text for CONFIG_FB_NVIDIA fbdev: omapfb: Add missing error check for clk_get() fbdev: viafb: check ioremap return value in viafb_lcd_get_mobile_state lib/fonts: Remove internal symbols and macros from public header file ...
This commit is contained in:
commit
afac4c66d1
45 files changed
+1325
-787
No files matched your search
@@ -230,6 +230,40 @@ enum {
|
||||
blank_vesa_wait,
|
||||
};
|
||||
|
||||
/*
|
||||
* struct vc_font
|
||||
*/
|
||||
|
||||
/**
|
||||
* vc_font_pitch - Calculates the number of bytes between two adjacent scanlines
|
||||
* @font: The VC font
|
||||
*
|
||||
* Returns:
|
||||
* The number of bytes between two adjacent scanlines in the font data
|
||||
*/
|
||||
unsigned int vc_font_pitch(const struct vc_font *font)
|
||||
{
|
||||
return font_glyph_pitch(font->width);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vc_font_pitch);
|
||||
|
||||
/**
|
||||
* vc_font_size - Calculates the size of the font data in bytes
|
||||
* @font: The VC font
|
||||
*
|
||||
* vc_font_size() calculates the number of bytes of font data in the
|
||||
* font specified by @font. The function calculates the size from the
|
||||
* font parameters.
|
||||
*
|
||||
* Returns:
|
||||
* The size of the font data in bytes.
|
||||
*/
|
||||
unsigned int vc_font_size(const struct vc_font *font)
|
||||
{
|
||||
return font_glyph_size(font->width, font->height) * font->charcount;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vc_font_size);
|
||||
|
||||
/*
|
||||
* /sys/class/tty/tty0/
|
||||
*
|
||||
|
||||
Reference in new issue
Block a user