Commit 8a10bc9d authored by Helge Deller's avatar Helge Deller
Browse files

parisc/sti_console: prefer Linux fonts over built-in ROM fonts 



The built-in ROM fonts lack many necessary ASCII characters, which is
why it makes sens to prefer the Linux fonts instead if they are
available.  This makes consoles on STI graphics cards which are not
supported by the stifb driver (e.g. Visualize FXe) looks much nicer.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org # v3.13
parent 602456bf

drivers/video/console/sticore.c

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static int sti_init_glob_cfg(struct sti_struct *sti, unsigned long rom_address, 
	return 0;

}



#ifdef CONFIG_FONTS

#ifdef CONFIG_FONT_SUPPORT

static struct sti_cooked_font *

sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)

{

lib/fonts/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ if FONT_SUPPORT 


config FONTS

	bool "Select compiled-in fonts"

	depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE

	depends on FRAMEBUFFER_CONSOLE

	help

	  Say Y here if you would like to use fonts other than the default

	  your frame buffer console usually use.
@@ -22,7 +22,7 @@ config FONTS 


config FONT_8x8

	bool "VGA 8x8 font" if FONTS

	depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE

	depends on FRAMEBUFFER_CONSOLE

	default y if !SPARC && !FONTS

	help

	  This is the "high resolution" font for the VGA frame buffer (the one
@@ -45,7 +45,7 @@ config FONT_8x16 


config FONT_6x11

	bool "Mac console 6x11 font (not supported by all drivers)" if FONTS

	depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE

	depends on FRAMEBUFFER_CONSOLE

	default y if !SPARC && !FONTS && MAC

	help

	  Small console font with Macintosh-style high-half glyphs.  Some Mac

CRA Git | Maintained and supported by SUSTech CRA and CCSE