serial: Convert ARM_DCC to Kconfig

[oweals/u-boot.git] / drivers / video / video_bmp.c

diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c
index 2898b0b55d759492d5b3a6379d357acdf615dbb0..eb9636541d7c565f99c026c9142745c22e3e256b 100644 (file)
--- a/drivers/video/video_bmp.c
+++ b/drivers/video/video_bmp.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <bmp_layout.h>
 #include <dm.h>
+#include <log.h>
 #include <mapmem.h>
 #include <splash.h>
 #include <video.h>
@@ -40,18 +41,16 @@ static void draw_encoded_bitmap(ushort **fbp, ushort col, int cnt)
 
 static void video_display_rle8_bitmap(struct udevice *dev,
                                      struct bmp_image *bmp, ushort *cmap,
-                                     uchar *fb, int x_off, int y_off)
+                                     uchar *fb, int x_off, int y_off,
+                                     ulong width, ulong height)
 {
        struct video_priv *priv = dev_get_uclass_priv(dev);
        uchar *bmap;
-       ulong width, height;
        ulong cnt, runlen;
        int x, y;
        int decode = 1;
 
        debug("%s\n", __func__);
-       width = get_unaligned_le32(&bmp->header.width);
-       height = get_unaligned_le32(&bmp->header.height);
        bmap = (uchar *)bmp + get_unaligned_le32(&bmp->header.data_offset);
 
        x = 0;
@@ -157,8 +156,8 @@ __weak void fb_put_word(uchar **fb, uchar **from)
 static void video_splash_align_axis(int *axis, unsigned long panel_size,
                                    unsigned long picture_size)
 {
-       unsigned long panel_picture_delta = panel_size - picture_size;
-       unsigned long axis_alignment;
+       long panel_picture_delta = panel_size - picture_size;
+       long axis_alignment;
 
        if (*axis == BMP_ALIGN_CENTER)
                axis_alignment = panel_picture_delta / 2;
@@ -229,11 +228,12 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y,
        }
 
        /*
-        * We support displaying 8bpp BMPs on 16bpp LCDs
+        * We support displaying 8bpp and 24bpp BMPs on 16bpp LCDs
         * and displaying 24bpp BMPs on 32bpp LCDs
-        * */
+        */
        if (bpix != bmp_bpix &&
            !(bmp_bpix == 8 && bpix == 16) &&
+           !(bmp_bpix == 24 && bpix == 16) &&
            !(bmp_bpix == 24 && bpix == 32)) {
                printf("Error: %d bit/pixel mode, but BMP has %d bit/pixel\n",
                       bpix, get_unaligned_le16(&bmp->header.bit_count));
@@ -276,7 +276,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y,
                                return -EPROTONOSUPPORT;
                        }
                        video_display_rle8_bitmap(dev, bmp, cmap_base, fb, x,
-                                                 y);
+                                                 y, width, height);
                        break;
                }
 #endif
@@ -318,12 +318,22 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y,
        case 24:
                for (i = 0; i < height; ++i) {
                        for (j = 0; j < width; j++) {
-                               *(fb++) = *(bmap++);
-                               *(fb++) = *(bmap++);
-                               *(fb++) = *(bmap++);
-                               *(fb++) = 0;
+                               if (bpix == 16) {
+                                       /* 16bit 555RGB format */
+                                       *(u16 *)fb = ((bmap[2] >> 3) << 10) |
+                                               ((bmap[1] >> 3) << 5) |
+                                               (bmap[0] >> 3);
+                                       bmap += 3;
+                                       fb += 2;
+                               } else {
+                                       *(fb++) = *(bmap++);
+                                       *(fb++) = *(bmap++);
+                                       *(fb++) = *(bmap++);
+                                       *(fb++) = 0;
+                               }
                        }
                        fb -= priv->line_length + width * (bpix / 8);
+                       bmap += (padded_width - width) * 3;
                }
                break;
 #endif /* CONFIG_BMP_24BPP */