ARM: boot/compressed: adjust Acorn font display code for added header
Subsystems (2)
PATCH 1/1 ARM: boot/compressed: adjust Acorn font display code for added header
Commit 6735b4632def ("Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts") added a header to the data for built-in fonts. However, the Acorn font display code in the ARM decompressor was never adjusted to account for the added offset to the raw data, causing the font to display incorrectly. Resolve this issue by adding the appropriate offset when referring to the font data variable.
Fixes 6735b4632def ("Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts")
Reported-by Russell King <[email protected]>
Cc [email protected] # 5.10+
Signed-off-by Ethan Nelson-Moore <[email protected]>
--- arch/arm/boot/compressed/ll_char_wr.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/compressed/ll_char_wr.S +2 -1
@@ -21,7 +21,8 @@ LC0: .word LC0 .word bytes_per_char_h .word video_size_row - .word acorndata_8x8 + @ The offset ensures that the header is skipped + .word acorndata_8x8 + 4 /* FONT_EXTRA_WORDS */ * 4 /* sizeof(int) */ .word con_charconvtable /*
Signature · 1 line
2.43.0