Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a536093a2f07007aa572e922752b7491b9ea8ff2

Authored by Antonino A. Daplas
Committed by Linus Torvalds
1 parent 2cbbb3b59c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] fbcon: Fix big-endian bogosity in slow_imageblit() 

The monochrome->color expansion routine that handles bitmaps which have
(widths % 8) != 0 (slow_imageblit) produces corrupt characters in big-endian.
This is caused by a bogus bit test in slow_imageblit().

Fix.

This patch may deserve to go to the stable tree.  The code has already been
well tested in little-endian machines.  It's only in big-endian where there is
uncertainty and Herbert confirmed that this is the correct way to go.

It should not introduce regressions.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Acked-by: Herbert Poetzl <herbert@13thfloor.at>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 2 changed files with 1 additions and 3 deletions Side-by-side Diff

drivers/video/cfbimgblt.c
Diff comments   View file @ a536093
... ... @@ -169,7 +169,7 @@
169 169  
170 170 while (j--) {
171 171 l--;
172   - color = (*s & 1 << (FB_BIT_NR(l))) ? fgcolor : bgcolor;
  172 + color = (*s & (1 << l)) ? fgcolor : bgcolor;
173 173 val |= FB_SHIFT_HIGH(color, shift);
174 174  
175 175 /* Did the bitshift spill bits to the next long? */
... ... @@ -839,12 +839,10 @@
839 839 #define FB_LEFT_POS(bpp) (32 - bpp)
840 840 #define FB_SHIFT_HIGH(val, bits) ((val) >> (bits))
841 841 #define FB_SHIFT_LOW(val, bits) ((val) << (bits))
842   -#define FB_BIT_NR(b) (7 - (b))
843 842 #else
844 843 #define FB_LEFT_POS(bpp) (0)
845 844 #define FB_SHIFT_HIGH(val, bits) ((val) << (bits))
846 845 #define FB_SHIFT_LOW(val, bits) ((val) >> (bits))
847   -#define FB_BIT_NR(b) (b)
848 846 #endif
849 847  
850 848 /*