Merge git://git.denx.de/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 63d0d9d7d3f5586f41b06f288db51e58295c8d29..dcaceed42c4e66821133fad83136c9aaf1b78b69 100644 (file)
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -42,11 +42,21 @@
  */
 DECLARE_GLOBAL_DATA_PTR;
 
+void video_set_flush_dcache(struct udevice *dev, bool flush)
+{
+       struct video_priv *priv = dev_get_uclass_priv(dev);
+
+       priv->flush_dcache = flush;
+}
+
 static ulong alloc_fb(struct udevice *dev, ulong *addrp)
 {
        struct video_uc_platdata *plat = dev_get_uclass_platdata(dev);
        ulong base, align, size;
 
+       if (!plat->size)
+               return 0;
+
        align = plat->align ? plat->align : 1 << 20;
        base = *addrp - plat->size;
        base &= ~(align - 1);
@@ -77,7 +87,7 @@ int video_reserve(ulong *addrp)
        return 0;
 }
 
-static int video_clear(struct udevice *dev)
+void video_clear(struct udevice *dev)
 {
        struct video_priv *priv = dev_get_uclass_priv(dev);
 
@@ -90,8 +100,6 @@ static int video_clear(struct udevice *dev)
        } else {
                memset(priv->fb, priv->colour_bg, priv->fb_size);
        }
-
-       return 0;
 }
 
 /* Flush video activity to the caches */
@@ -107,7 +115,8 @@ void video_sync(struct udevice *vid)
 
        if (priv->flush_dcache) {
                flush_dcache_range((ulong)priv->fb,
-                                  (ulong)priv->fb + priv->fb_size);
+                                  ALIGN((ulong)priv->fb + priv->fb_size,
+                                        CONFIG_SYS_CACHELINE_SIZE));
        }
 #elif defined(CONFIG_VIDEO_SANDBOX_SDL)
        struct video_priv *priv = dev_get_uclass_priv(vid);
@@ -173,6 +182,7 @@ static int video_post_probe(struct udevice *dev)
        struct video_uc_platdata *plat = dev_get_uclass_platdata(dev);
        struct video_priv *priv = dev_get_uclass_priv(dev);
        char name[30], drv[15], *str;
+       const char *drv_name = drv;
        struct udevice *cons;
        int ret;
 
@@ -187,23 +197,43 @@ static int video_post_probe(struct udevice *dev)
 #else
        priv->colour_bg = 0xffffff;
 #endif
-       video_clear(dev);
+
+       if (!CONFIG_IS_ENABLED(NO_FB_CLEAR))
+               video_clear(dev);
 
        /*
-        * Create a text console devices. For now we always do this, although
+        * Create a text console device. For now we always do this, although
         * it might be useful to support only bitmap drawing on the device
-        * for boards that don't need to display text.
+        * for boards that don't need to display text. We create a TrueType
+        * console if enabled, a rotated console if the video driver requests
+        * it, otherwise a normal console.
+        *
+        * The console can be override by setting vidconsole_drv_name before
+        * probing this video driver, or in the probe() method.
+        *
+        * TrueType does not support rotation at present so fall back to the
+        * rotated console in that case.
         */
-       snprintf(name, sizeof(name), "%s.vidconsole", dev->name);
+       if (!priv->rot && IS_ENABLED(CONFIG_CONSOLE_TRUETYPE)) {
+               snprintf(name, sizeof(name), "%s.vidconsole_tt", dev->name);
+               strcpy(drv, "vidconsole_tt");
+       } else {
+               snprintf(name, sizeof(name), "%s.vidconsole%d", dev->name,
+                        priv->rot);
+               snprintf(drv, sizeof(drv), "vidconsole%d", priv->rot);
+       }
+
        str = strdup(name);
        if (!str)
                return -ENOMEM;
-       snprintf(drv, sizeof(drv), "vidconsole%d", priv->rot);
-       ret = device_bind_driver(dev, drv, str, &cons);
+       if (priv->vidconsole_drv_name)
+               drv_name = priv->vidconsole_drv_name;
+       ret = device_bind_driver(dev, drv_name, str, &cons);
        if (ret) {
                debug("%s: Cannot bind console driver\n", __func__);
                return ret;
        }
+
        ret = device_probe(cons);
        if (ret) {
                debug("%s: Cannot probe console driver\n", __func__);