Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

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

diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index b6551b69d3ae2cc039032909dae539919807953c..3d658e61d7c6ccba03164ca239b6962a85478fb2 100644 (file)
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -4,7 +4,9 @@
  */
 
 #include <common.h>
+#include <cpu_func.h>
 #include <dm.h>
+#include <malloc.h>
 #include <mapmem.h>
 #include <stdio_dev.h>
 #include <video.h>
@@ -91,22 +93,24 @@ int video_clear(struct udevice *dev)
        struct video_priv *priv = dev_get_uclass_priv(dev);
 
        switch (priv->bpix) {
-       case VIDEO_BPP16: {
-               u16 *ppix = priv->fb;
-               u16 *end = priv->fb + priv->fb_size;
-
-               while (ppix < end)
-                       *ppix++ = priv->colour_bg;
-               break;
-       }
-       case VIDEO_BPP32: {
-               u32 *ppix = priv->fb;
-               u32 *end = priv->fb + priv->fb_size;
-
-               while (ppix < end)
-                       *ppix++ = priv->colour_bg;
-               break;
-       }
+       case VIDEO_BPP16:
+               if (IS_ENABLED(CONFIG_VIDEO_BPP16)) {
+                       u16 *ppix = priv->fb;
+                       u16 *end = priv->fb + priv->fb_size;
+
+                       while (ppix < end)
+                               *ppix++ = priv->colour_bg;
+                       break;
+               }
+       case VIDEO_BPP32:
+               if (IS_ENABLED(CONFIG_VIDEO_BPP32)) {
+                       u32 *ppix = priv->fb;
+                       u32 *end = priv->fb + priv->fb_size;
+
+                       while (ppix < end)
+                               *ppix++ = priv->colour_bg;
+                       break;
+               }
        default:
                memset(priv->fb, priv->colour_bg, priv->fb_size);
                break;
@@ -120,14 +124,14 @@ void video_set_default_colors(struct udevice *dev, bool invert)
        struct video_priv *priv = dev_get_uclass_priv(dev);
        int fore, back;
 
-#ifdef CONFIG_SYS_WHITE_ON_BLACK
-       /* White is used when switching to bold, use light gray here */
-       fore = VID_LIGHT_GRAY;
-       back = VID_BLACK;
-#else
-       fore = VID_BLACK;
-       back = VID_WHITE;
-#endif
+       if (CONFIG_IS_ENABLED(SYS_WHITE_ON_BLACK)) {
+               /* White is used when switching to bold, use light gray here */
+               fore = VID_LIGHT_GRAY;
+               back = VID_BLACK;
+       } else {
+               fore = VID_BLACK;
+               back = VID_WHITE;
+       }
        if (invert) {
                int temp;
 
@@ -136,6 +140,7 @@ void video_set_default_colors(struct udevice *dev, bool invert)
                back = temp;
        }
        priv->fg_col_idx = fore;
+       priv->bg_col_idx = back;
        priv->colour_fg = vid_console_color(priv, fore);
        priv->colour_bg = vid_console_color(priv, back);
 }
@@ -148,7 +153,7 @@ void video_sync(struct udevice *vid, bool force)
         * architectures do not actually implement it. Is there a way to find
         * out whether it exists? For now, ARM is safe.
         */
-#if defined(CONFIG_ARM) && !defined(CONFIG_SYS_DCACHE_OFF)
+#if defined(CONFIG_ARM) && !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
        struct video_priv *priv = dev_get_uclass_priv(vid);
 
        if (priv->flush_dcache) {
@@ -226,7 +231,9 @@ static int video_post_probe(struct udevice *dev)
 
        /* Set up the line and display size */
        priv->fb = map_sysmem(plat->base, plat->size);
-       priv->line_length = priv->xsize * VNBYTES(priv->bpix);
+       if (!priv->line_length)
+               priv->line_length = priv->xsize * VNBYTES(priv->bpix);
+
        priv->fb_size = priv->line_length * priv->ysize;
 
        /* Set up colors  */
@@ -288,7 +295,9 @@ static int video_post_bind(struct udevice *dev)
                return 0;
        size = alloc_fb(dev, &addr);
        if (addr < gd->video_bottom) {
-               /* Device tree node may need the 'u-boot,dm-pre-reloc' tag */
+               /* Device tree node may need the 'u-boot,dm-pre-reloc' or
+                * 'u-boot,dm-pre-proper' tag
+                */
                printf("Video device '%s' cannot allocate frame buffer memory -ensure the device is set up before relocation\n",
                       dev->name);
                return -ENOSPC;