video: Add a way to get the default font height

This is not as simple as it seems. Add a function to provide it so that
the upcoming menu feature can space lines out correctly.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index fbe1ad169e9f0a67cf07ee689275a2848de3e7c2..0ce376ca3f144ed37b2d286f88d6c70e10acf971 100644 (file)
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -421,6 +421,17 @@ static int show_splash(struct udevice *dev)
        return 0;
 }
 
+int video_default_font_height(struct udevice *dev)
+{
+       struct vidconsole_priv *vc_priv = dev_get_uclass_priv(dev);
+
+       if (IS_ENABLED(CONFIG_CONSOLE_TRUETYPE))
+               return IF_ENABLED_INT(CONFIG_CONSOLE_TRUETYPE,
+                                     CONFIG_CONSOLE_TRUETYPE_SIZE);
+
+       return vc_priv->y_charsize;
+}
+
 /* Set up the display ready for use */
 static int video_post_probe(struct udevice *dev)
 {

diff --git a/include/video.h b/include/video.h
index 32afb26a45ba0e83f9be6d71891d3b4171a2aa04..529f9685183eb6e04bbe3f768ae02af4f212c220 100644 (file)
--- a/include/video.h
+++ b/include/video.h
@@ -286,6 +286,15 @@ void video_set_flush_dcache(struct udevice *dev, bool flush);
  */
 void video_set_default_colors(struct udevice *dev, bool invert);
 
+/**
+ * video_default_font_height() - Get the default font height
+ *
+ * @dev:       video device
+ * Returns: Default font height in pixels, which depends on which console driver
+ * is in use
+ */
+int video_default_font_height(struct udevice *dev);
+
 #ifdef CONFIG_VIDEO_COPY
 /**
  * vidconsole_sync_copy() - Sync back to the copy framebuffer