diff mbox series

[v3,5/5] x86: video: Show information about each video device

Message ID 20200922211636.v3.5.I27387a60499ae66446ae94ada3060dce1bc21817@changeid
State Accepted
Delegated to: Bin Meng
Headers show
Series x86: Updates to some commands | expand

Commit Message

Simon Glass Sept. 23, 2020, 3:16 a.m. UTC 
At present the 'bdinfo' command shows the framebuffer address, but not the
address of the copy framebuffer, if present. Add support for this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

Changes in v3:
- Update header file to avoid build error with !DM_VIDEO

 cmd/bdinfo.c    | 26 +++++++++++++++++++++++++-
 include/video.h |  6 ++----
 2 files changed, 27 insertions(+), 5 deletions(-)

Comments

Bin Meng Sept. 23, 2020, 5:17 a.m. UTC | #1 
On Wed, Sep 23, 2020 at 11:16 AM Simon Glass <sjg@chromium.org> wrote:
>
> At present the 'bdinfo' command shows the framebuffer address, but not the
> address of the copy framebuffer, if present. Add support for this.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
> Changes in v3:
> - Update header file to avoid build error with !DM_VIDEO
>
>  cmd/bdinfo.c    | 26 +++++++++++++++++++++++++-
>  include/video.h |  6 ++----
>  2 files changed, 27 insertions(+), 5 deletions(-)
>

applied to u-boot-x86/next, thanks!
diff mbox series

Patch

diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index 9593b345a3d..2d88eb18ba7 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -8,9 +8,11 @@ 
 
 #include <common.h>
 #include <command.h>
+#include <dm.h>
 #include <env.h>
 #include <lmb.h>
 #include <net.h>
+#include <video.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
 
@@ -66,6 +68,26 @@  __weak void arch_print_bdinfo(void)
 {
 }
 
+static void show_video_info(void)
+{
+	const struct udevice *dev;
+	struct uclass *uc;
+
+	uclass_id_foreach_dev(UCLASS_VIDEO, dev, uc) {
+		printf("%-12s= %s %sactive\n", "Video", dev->name,
+		       device_active(dev) ? "" : "in");
+		if (device_active(dev)) {
+			struct video_priv *upriv = dev_get_uclass_priv(dev);
+
+			print_phys_addr("FB base", (ulong)upriv->fb);
+			if (upriv->copy_fb)
+				print_phys_addr("FB copy", (ulong)upriv->copy_fb);
+			printf("%-12s= %dx%dx%d\n", "FB size", upriv->xsize,
+			       upriv->ysize, 1 << upriv->bpix);
+		}
+	}
+}
+
 int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
 	struct bd_info *bd = gd->bd;
@@ -96,7 +118,9 @@  int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 	bdinfo_print_num("fdt_blob", (ulong)gd->fdt_blob);
 	bdinfo_print_num("new_fdt", (ulong)gd->new_fdt);
 	bdinfo_print_num("fdt_size", (ulong)gd->fdt_size);
-#if defined(CONFIG_LCD) || defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO)
+	if (IS_ENABLED(CONFIG_DM_VIDEO))
+		show_video_info();
+#if defined(CONFIG_LCD) || defined(CONFIG_VIDEO)
 	bdinfo_print_num("FB base  ", gd->fb_base);
 #endif
 #if CONFIG_IS_ENABLED(MULTI_DTB_FIT)
diff --git a/include/video.h b/include/video.h
index 1a0ffd80379..9d09d2409af 100644
--- a/include/video.h
+++ b/include/video.h
@@ -13,8 +13,6 @@ 
 #ifndef _VIDEO_H_
 #define _VIDEO_H_
 
-#ifdef CONFIG_DM_VIDEO
-
 #include <stdio_dev.h>
 
 struct udevice;
@@ -140,6 +138,7 @@  struct video_ops {
  */
 int video_reserve(ulong *addrp);
 
+#ifdef CONFIG_DM_VIDEO
 /**
  * video_clear() - Clear a device's frame buffer to background color.
  *
@@ -147,6 +146,7 @@  int video_reserve(ulong *addrp);
  * @return 0
  */
 int video_clear(struct udevice *dev);
+#endif /* CONFIG_DM_VIDEO */
 
 /**
  * video_sync() - Sync a device's frame buffer with its hardware
@@ -243,8 +243,6 @@  static inline int video_sync_copy(struct udevice *dev, void *from, void *to)
 }
 #endif
 
-#endif /* CONFIG_DM_VIDEO */
-
 #ifndef CONFIG_DM_VIDEO
 
 /* Video functions */