x86: Add a VESA video driver

Add a driver intended to cope with any VESA-compatible x86 graphics
adapter. It will not support ROMs which use OpenFirmware (Forth) since
there is no support for that in U-Boot. This means that MAC OS cards
will not work.

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

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index ccbd7e295dda9d259cb1b54c208fc8e4e3678268..697171e413c2fa7e12d75e00ee1ab1767489cc83 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1,3 +1,13 @@
+config VIDEO_VESA
+       bool "Enable VESA video driver support"
+       depends on X86
+       default n
+       help
+         Turn on this option to enable a very simple driver which uses vesa
+         to discover the video mode and then provides a frame buffer for use
+         by U-Boot. This can in principle be used with any platform that
+         supports PCI and video cards that support VESA BIOS Extension (VBE).
+
 config VIDEO_X86
        bool "Enable x86 video driver support"
        depends on X86

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index c3fcf455d268eeb5442cbe3987c11bd5b0750f01..9f3c8bba17c7ed66df842c83b54f6476c688eaa5 100644 (file)
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -44,6 +44,7 @@ obj-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o
 obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o videomodes.o
 obj-$(CONFIG_VIDEO_TEGRA) += tegra.o
 obj-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o
+obj-$(CONFIG_VIDEO_VESA) += vesa_fb.o
 obj-$(CONFIG_VIDEO_X86) += x86_fb.o
 obj-$(CONFIG_FORMIKE) += formike.o
 obj-$(CONFIG_AM335X_LCD) += am335x-fb.o

diff --git a/drivers/video/vesa_fb.c b/drivers/video/vesa_fb.c
new file mode 100644 (file)
index 0000000..3dacafd
--- /dev/null
+++ b/drivers/video/vesa_fb.c
@@ -0,0 +1,64 @@
+/*
+ *
+ * Vesa frame buffer driver for x86
+ *
+ * Copyright (C) 2014 Google, Inc
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <pci_rom.h>
+#include <video_fb.h>
+#include <vbe.h>
+
+/*
+ * The Graphic Device
+ */
+GraphicDevice ctfb;
+
+/* Devices to allow - only the last one works fully */
+struct pci_device_id vesa_video_ids[] = {
+       { .vendor = 0x102b, .device = 0x0525 },
+       { .vendor = 0x1002, .device = 0x5159 },
+       { .vendor = 0x1002, .device = 0x4752 },
+       { .vendor = 0x1002, .device = 0x5452 },
+       {},
+};
+
+void *video_hw_init(void)
+{
+       GraphicDevice *gdev = &ctfb;
+       int bits_per_pixel;
+       pci_dev_t dev;
+       int ret;
+
+       printf("Video: ");
+       if (vbe_get_video_info(gdev)) {
+               /* TODO: Should we look these up by class? */
+               dev = pci_find_devices(vesa_video_ids, 0);
+               if (dev == -1) {
+                       printf("no card detected\n");
+                       return NULL;
+               }
+               printf("bdf %x\n", dev);
+               ret = pci_run_vga_bios(dev, NULL, true);
+               if (ret) {
+                       printf("failed to run video BIOS: %d\n", ret);
+                       return NULL;
+               }
+       }
+
+       if (vbe_get_video_info(gdev)) {
+               printf("No video mode configured\n");
+               return NULL;
+       }
+
+       bits_per_pixel = gdev->gdfBytesPP * 8;
+       sprintf(gdev->modeIdent, "%dx%dx%d", gdev->winSizeX, gdev->winSizeY,
+               bits_per_pixel);
+       printf("%s\n", gdev->modeIdent);
+       debug("Framex buffer at %x\n", gdev->pciBase);
+
+       return (void *)gdev;
+}