chromebook_link: Enable the copy framebuffer

Update the video driver to support this feature and enable it on link.
Also remove the multi-line scrolling since normal scrolling is fast enough
now.

With this change, the time taken to print the environment to the display
without CONFIG_CONSOLE_SCROLL_LINES is reduced from about 930ms to 29ms.

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

diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 3d51ec96064780309a317012a64d5fdea57ec185..7e9a7a3cc324d825c89f1086375c2572f93e64cc 100644 (file)
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -62,10 +62,10 @@ CONFIG_SPI=y
 CONFIG_TPM_TIS_LPC=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_VIDEO_COPY=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_VIDEO_IVYBRIDGE_IGD=y
-CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_TPM=y
 # CONFIG_GZIP is not set

diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c
index 4c57e311d163b67a116d4fc35e30b70e1de55872..2587f53ac1d44f1881f287f1b5ddeb3f95c27bfb 100644 (file)
--- a/drivers/video/ivybridge_igd.c
+++ b/drivers/video/ivybridge_igd.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <pci_rom.h>
 #include <vbe.h>
+#include <video.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/mtrr.h>
@@ -722,7 +723,6 @@ static int gma_func0_init(struct udevice *dev)
 {
        struct udevice *nbridge;
        void *gtt_bar;
-       ulong base;
        u32 reg32;
        int ret;
        int rev;
@@ -742,11 +742,6 @@ static int gma_func0_init(struct udevice *dev)
        reg32 |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO;
        dm_pci_write_config32(dev, PCI_COMMAND, reg32);
 
-       /* Use write-combining for the graphics memory, 256MB */
-       base = dm_pci_read_bar32(dev, 2);
-       mtrr_add_request(MTRR_TYPE_WRCOMB, base, 256 << 20);
-       mtrr_commit(true);
-
        gtt_bar = (void *)(ulong)dm_pci_read_bar32(dev, 0);
        debug("GT bar %p\n", gtt_bar);
        ret = gma_pm_init_pre_vbios(gtt_bar, rev);
@@ -758,6 +753,8 @@ static int gma_func0_init(struct udevice *dev)
 
 static int bd82x6x_video_probe(struct udevice *dev)
 {
+       struct video_uc_platdata *plat = dev_get_uclass_platdata(dev);
+       ulong fbbase;
        void *gtt_bar;
        int ret, rev;
 
@@ -774,6 +771,22 @@ static int bd82x6x_video_probe(struct udevice *dev)
        if (ret)
                return ret;
 
+       /* Use write-combining for the graphics memory, 256MB */
+       fbbase = IS_ENABLED(CONFIG_VIDEO_COPY) ? plat->copy_base : plat->base;
+       mtrr_add_request(MTRR_TYPE_WRCOMB, fbbase, 256 << 20);
+       mtrr_commit(true);
+
+       return 0;
+}
+
+static int bd82x6x_video_bind(struct udevice *dev)
+{
+       struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev);
+
+       /* Set the maximum supported resolution */
+       uc_plat->size = 2560 * 1600 * 4;
+       log_debug("%s: Frame buffer size %x\n", __func__, uc_plat->size);
+
        return 0;
 }
 
@@ -786,5 +799,6 @@ U_BOOT_DRIVER(bd82x6x_video) = {
        .name   = "bd82x6x_video",
        .id     = UCLASS_VIDEO,
        .of_match = bd82x6x_video_ids,
+       .bind   = bd82x6x_video_bind,
        .probe  = bd82x6x_video_probe,
 };