fbdev: fix fillrect for 24bpp modes

[firefly-linux-kernel-4.4.55.git] / drivers / video / fb_draw.h

diff --git a/drivers/video/fb_draw.h b/drivers/video/fb_draw.h
index 1db622192bde2252553eb91ce69123d6fc69512f..04c01faaf7721b71041461f56c6b2032d3085d81 100644 (file)
--- a/drivers/video/fb_draw.h
+++ b/drivers/video/fb_draw.h
@@ -33,11 +33,11 @@ pixel_to_pat( u32 bpp, u32 pixel)
        case 8:
                return 0x0101010101010101ul*pixel;
        case 12:
-               return 0x0001001001001001ul*pixel;
+               return 0x1001001001001001ul*pixel;
        case 16:
                return 0x0001000100010001ul*pixel;
        case 24:
-               return 0x0000000001000001ul*pixel;
+               return 0x0001000001000001ul*pixel;
        case 32:
                return 0x0000000100000001ul*pixel;
        default:
@@ -58,11 +58,11 @@ pixel_to_pat( u32 bpp, u32 pixel)
        case 8:
                return 0x01010101ul*pixel;
        case 12:
-               return 0x00001001ul*pixel;
+               return 0x01001001ul*pixel;
        case 16:
                return 0x00010001ul*pixel;
        case 24:
-               return 0x00000001ul*pixel;
+               return 0x01000001ul*pixel;
        case 32:
                return 0x00000001ul*pixel;
        default:
@@ -167,4 +167,17 @@ static inline unsigned long fb_rev_pixels_in_long(unsigned long val,
 
 #endif  /* CONFIG_FB_CFB_REV_PIXELS_IN_BYTE */
 
+#define cpu_to_le_long _cpu_to_le_long(BITS_PER_LONG)
+#define _cpu_to_le_long(x) __cpu_to_le_long(x)
+#define __cpu_to_le_long(x) cpu_to_le##x
+
+#define le_long_to_cpu _le_long_to_cpu(BITS_PER_LONG)
+#define _le_long_to_cpu(x) __le_long_to_cpu(x)
+#define __le_long_to_cpu(x) le##x##_to_cpu
+
+static inline unsigned long rolx(unsigned long word, unsigned int shift, unsigned int x)
+{
+       return (word << shift) | (word >> (x - shift));
+}
+
 #endif /* FB_DRAW_H */