31004e6
From f387540a52ff93c10fca1e765adaeb829c44e688 Mon Sep 17 00:00:00 2001
31004e6
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
31004e6
Date: Sun, 21 Apr 2013 13:02:10 +0200
f74b50e
Subject: [PATCH 333/482] 	Support coreboot framebuffer.
31004e6
31004e6
	* grub-core/video/i386/coreboot/cbfb.c: New file.
31004e6
---
31004e6
 ChangeLog                               |   6 ++
31004e6
 grub-core/Makefile.core.def             |   6 ++
31004e6
 grub-core/commands/i386/coreboot/cbls.c |  16 ++-
31004e6
 grub-core/video/i386/coreboot/cbfb.c    | 180 ++++++++++++++++++++++++++++++++
31004e6
 include/grub/i386/coreboot/lbio.h       |  36 +++++--
31004e6
 5 files changed, 236 insertions(+), 8 deletions(-)
31004e6
 create mode 100644 grub-core/video/i386/coreboot/cbfb.c
31004e6
31004e6
diff --git a/ChangeLog b/ChangeLog
31004e6
index 2a4264c..6be583e 100644
31004e6
--- a/ChangeLog
31004e6
+++ b/ChangeLog
31004e6
@@ -1,3 +1,9 @@
31004e6
+2013-04-21  Vladimir Serbinenko  <phcoder@gmail.com>
31004e6
+
31004e6
+	Support coreboot framebuffer.
31004e6
+
31004e6
+	* grub-core/video/i386/coreboot/cbfb.c: New file.
31004e6
+
31004e6
 2013-04-20  Vladimir Serbinenko  <phcoder@gmail.com>
31004e6
 
31004e6
 	* grub-core/kern/mm.c (grub_mm_init_region): Fix condition for
31004e6
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
31004e6
index 1f04afb..7269609 100644
31004e6
--- a/grub-core/Makefile.core.def
31004e6
+++ b/grub-core/Makefile.core.def
31004e6
@@ -1797,6 +1797,12 @@ module = {
31004e6
 };
31004e6
 
31004e6
 module = {
31004e6
+  name = coreboot_fb;
31004e6
+  common = video/i386/coreboot/cbfb.c;
31004e6
+  enable = i386_coreboot;
31004e6
+};
31004e6
+
31004e6
+module = {
31004e6
   name = sdl;
31004e6
   emu = video/emu/sdl.c;
31004e6
   enable = emu;
31004e6
diff --git a/grub-core/commands/i386/coreboot/cbls.c b/grub-core/commands/i386/coreboot/cbls.c
31004e6
index 151f9e8..a3542f3 100644
31004e6
--- a/grub-core/commands/i386/coreboot/cbls.c
31004e6
+++ b/grub-core/commands/i386/coreboot/cbls.c
31004e6
@@ -50,7 +50,7 @@ static const char *descs[] = {
31004e6
   [0xd] = "assembler",
31004e6
   [0xf] = "serial",
31004e6
   [GRUB_LINUXBIOS_MEMBER_CONSOLE] = "console",
31004e6
-  [0x12] = "framebuffer",
31004e6
+  [GRUB_LINUXBIOS_MEMBER_FRAMEBUFFER] = "framebuffer",
31004e6
   [0x13] = "GPIO",
31004e6
   [0x15] = "VDAT",
31004e6
   [GRUB_LINUXBIOS_MEMBER_TIMESTAMPS] = "timestamps (`coreboot_boottime' to list)",
31004e6
@@ -77,6 +77,20 @@ iterate_linuxbios_table (grub_linuxbios_table_item_t table_item,
31004e6
 
31004e6
   switch (table_item->tag)
31004e6
     {
31004e6
+    case GRUB_LINUXBIOS_MEMBER_FRAMEBUFFER:
31004e6
+      {
31004e6
+	struct grub_linuxbios_table_framebuffer *fb;
31004e6
+	fb = (struct grub_linuxbios_table_framebuffer *) (table_item + 1);
31004e6
+
31004e6
+	grub_printf (": %dx%dx%d pitch=%d lfb=0x%llx %d/%d/%d/%d %d/%d/%d/%d",
31004e6
+		     fb->width, fb->height,
31004e6
+		     fb->bpp, fb->pitch, fb->lfb,
31004e6
+		     fb->red_mask_size, fb->green_mask_size,
31004e6
+		     fb->blue_mask_size, fb->reserved_mask_size,
31004e6
+		     fb->red_field_pos, fb->green_field_pos,
31004e6
+		     fb->blue_field_pos, fb->reserved_field_pos);
31004e6
+	break;
31004e6
+      }
31004e6
     case GRUB_LINUXBIOS_MEMBER_MAINBOARD:
31004e6
       {
31004e6
 	struct grub_linuxbios_mainboard *mb;
31004e6
diff --git a/grub-core/video/i386/coreboot/cbfb.c b/grub-core/video/i386/coreboot/cbfb.c
31004e6
new file mode 100644
31004e6
index 0000000..000efdb
31004e6
--- /dev/null
31004e6
+++ b/grub-core/video/i386/coreboot/cbfb.c
31004e6
@@ -0,0 +1,180 @@
31004e6
+/*
31004e6
+ *  GRUB  --  GRand Unified Bootloader
31004e6
+ *  Copyright (C) 2005,2006,2007,2008,2009  Free Software Foundation, Inc.
31004e6
+ *
31004e6
+ *  GRUB is free software: you can redistribute it and/or modify
31004e6
+ *  it under the terms of the GNU General Public License as published by
31004e6
+ *  the Free Software Foundation, either version 3 of the License, or
31004e6
+ *  (at your option) any later version.
31004e6
+ *
31004e6
+ *  GRUB is distributed in the hope that it will be useful,
31004e6
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
31004e6
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
31004e6
+ *  GNU General Public License for more details.
31004e6
+ *
31004e6
+ *  You should have received a copy of the GNU General Public License
31004e6
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
31004e6
+ */
31004e6
+
31004e6
+#define grub_video_render_target grub_video_fbrender_target
31004e6
+
31004e6
+#include <grub/err.h>
31004e6
+#include <grub/types.h>
31004e6
+#include <grub/dl.h>
31004e6
+#include <grub/misc.h>
31004e6
+#include <grub/mm.h>
31004e6
+#include <grub/video.h>
31004e6
+#include <grub/video_fb.h>
31004e6
+#include <grub/machine/lbio.h>
31004e6
+
31004e6
+GRUB_MOD_LICENSE ("GPLv3+");
31004e6
+
31004e6
+static struct grub_linuxbios_table_framebuffer *cbfb;
31004e6
+
31004e6
+static struct
31004e6
+{
31004e6
+  struct grub_video_mode_info mode_info;
31004e6
+  grub_uint8_t *ptr;
31004e6
+} framebuffer;
31004e6
+
31004e6
+static grub_err_t
31004e6
+grub_video_cbfb_init (void)
31004e6
+{
31004e6
+  grub_memset (&framebuffer, 0, sizeof(framebuffer));
31004e6
+
31004e6
+  return grub_video_fb_init ();
31004e6
+}
31004e6
+
31004e6
+static grub_err_t
31004e6
+grub_video_cbfb_fill_mode_info (struct grub_video_mode_info *out)
31004e6
+{
31004e6
+  grub_memset (out, 0, sizeof (*out));
31004e6
+
31004e6
+  out->width = cbfb->width;
31004e6
+  out->height = cbfb->height;
31004e6
+  out->pitch = cbfb->pitch;
31004e6
+
31004e6
+  out->red_field_pos = cbfb->red_field_pos;
31004e6
+  out->red_mask_size = cbfb->red_mask_size;
31004e6
+  out->green_field_pos = cbfb->green_field_pos;
31004e6
+  out->green_mask_size = cbfb->green_mask_size;
31004e6
+  out->blue_field_pos = cbfb->blue_field_pos;
31004e6
+  out->blue_mask_size = cbfb->blue_mask_size;
31004e6
+  out->reserved_field_pos = cbfb->reserved_field_pos;
31004e6
+  out->reserved_mask_size = cbfb->reserved_mask_size;
31004e6
+
31004e6
+  out->mode_type = GRUB_VIDEO_MODE_TYPE_RGB;
31004e6
+  out->bpp = cbfb->bpp;
31004e6
+  out->bytes_per_pixel = (cbfb->bpp + 7) / 8;
31004e6
+  out->number_of_colors = 256;
31004e6
+
31004e6
+  out->blit_format = grub_video_get_blit_format (out);
31004e6
+  return GRUB_ERR_NONE;
31004e6
+}
31004e6
+
31004e6
+static grub_err_t
31004e6
+grub_video_cbfb_setup (unsigned int width, unsigned int height,
31004e6
+			   unsigned int mode_type __attribute__ ((unused)),
31004e6
+			   unsigned int mode_mask __attribute__ ((unused)))
31004e6
+{
31004e6
+  grub_err_t err;
31004e6
+
31004e6
+  if (!cbfb)
31004e6
+    return grub_error (GRUB_ERR_IO, "Couldn't find display device.");
31004e6
+
31004e6
+  if (!((width == cbfb->width && height == cbfb->height)
31004e6
+	|| (width == 0 && height == 0)))
31004e6
+    return grub_error (GRUB_ERR_IO, "can't set mode %dx%d", width, height);
31004e6
+
31004e6
+  err = grub_video_cbfb_fill_mode_info (&framebuffer.mode_info);
31004e6
+  if (err)
31004e6
+    {
31004e6
+      grub_dprintf ("video", "CBFB: couldn't fill mode info\n");
31004e6
+      return err;
31004e6
+    }
31004e6
+
31004e6
+  framebuffer.ptr = (void *) (grub_addr_t) cbfb->lfb;
31004e6
+
31004e6
+  grub_dprintf ("video", "CBFB: initialising FB @ %p %dx%dx%d\n",
31004e6
+		framebuffer.ptr, framebuffer.mode_info.width,
31004e6
+		framebuffer.mode_info.height, framebuffer.mode_info.bpp);
31004e6
+
31004e6
+  err = grub_video_fb_setup (mode_type, mode_mask,
31004e6
+			     &framebuffer.mode_info,
31004e6
+			     framebuffer.ptr, NULL, NULL);
31004e6
+  if (err)
31004e6
+    return err;
31004e6
+
31004e6
+  grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
31004e6
+			     grub_video_fbstd_colors);
31004e6
+    
31004e6
+  return err;
31004e6
+}
31004e6
+
31004e6
+static grub_err_t
31004e6
+grub_video_cbfb_get_info_and_fini (struct grub_video_mode_info *mode_info,
31004e6
+				  void **framebuf)
31004e6
+{
31004e6
+  grub_memcpy (mode_info, &(framebuffer.mode_info), sizeof (*mode_info));
31004e6
+  *framebuf = (char *) framebuffer.ptr;
31004e6
+
31004e6
+  grub_video_fb_fini ();
31004e6
+
31004e6
+  return GRUB_ERR_NONE;
31004e6
+}
31004e6
+
31004e6
+static struct grub_video_adapter grub_video_cbfb_adapter =
31004e6
+  {
31004e6
+    .name = "Coreboot video driver",
31004e6
+
31004e6
+    .prio = GRUB_VIDEO_ADAPTER_PRIO_FIRMWARE_DIRTY,
31004e6
+
31004e6
+    .init = grub_video_cbfb_init,
31004e6
+    .fini = grub_video_fb_fini,
31004e6
+    .setup = grub_video_cbfb_setup,
31004e6
+    .get_info = grub_video_fb_get_info,
31004e6
+    .get_info_and_fini = grub_video_cbfb_get_info_and_fini,
31004e6
+    .set_palette = grub_video_fb_set_palette,
31004e6
+    .get_palette = grub_video_fb_get_palette,
31004e6
+    .set_viewport = grub_video_fb_set_viewport,
31004e6
+    .get_viewport = grub_video_fb_get_viewport,
31004e6
+    .map_color = grub_video_fb_map_color,
31004e6
+    .map_rgb = grub_video_fb_map_rgb,
31004e6
+    .map_rgba = grub_video_fb_map_rgba,
31004e6
+    .unmap_color = grub_video_fb_unmap_color,
31004e6
+    .fill_rect = grub_video_fb_fill_rect,
31004e6
+    .blit_bitmap = grub_video_fb_blit_bitmap,
31004e6
+    .blit_render_target = grub_video_fb_blit_render_target,
31004e6
+    .scroll = grub_video_fb_scroll,
31004e6
+    .swap_buffers = grub_video_fb_swap_buffers,
31004e6
+    .create_render_target = grub_video_fb_create_render_target,
31004e6
+    .delete_render_target = grub_video_fb_delete_render_target,
31004e6
+    .set_active_render_target = grub_video_fb_set_active_render_target,
31004e6
+    .get_active_render_target = grub_video_fb_get_active_render_target,
31004e6
+
31004e6
+    .next = 0
31004e6
+  };
31004e6
+
31004e6
+static int
31004e6
+iterate_linuxbios_table (grub_linuxbios_table_item_t table_item,
31004e6
+			 void *data __attribute__ ((unused)))
31004e6
+{
31004e6
+  if (table_item->tag != GRUB_LINUXBIOS_MEMBER_FRAMEBUFFER)
31004e6
+    return 0;
31004e6
+  cbfb = (struct grub_linuxbios_table_framebuffer *) (table_item + 1);
31004e6
+  return 1;
31004e6
+}
31004e6
+
31004e6
+GRUB_MOD_INIT(coreboot_fb)
31004e6
+{
31004e6
+  grub_linuxbios_table_iterate (iterate_linuxbios_table, 0);
31004e6
+
31004e6
+  if (cbfb)
31004e6
+    grub_video_register (&grub_video_cbfb_adapter);
31004e6
+}
31004e6
+
31004e6
+GRUB_MOD_FINI(coreboot_fb)
31004e6
+{
31004e6
+  if (cbfb)
31004e6
+    grub_video_unregister (&grub_video_cbfb_adapter);
31004e6
+}
31004e6
diff --git a/include/grub/i386/coreboot/lbio.h b/include/grub/i386/coreboot/lbio.h
31004e6
index b4150f4..9a93046 100644
31004e6
--- a/include/grub/i386/coreboot/lbio.h
31004e6
+++ b/include/grub/i386/coreboot/lbio.h
31004e6
@@ -54,18 +54,40 @@ struct grub_linuxbios_mainboard
31004e6
 
31004e6
 struct grub_linuxbios_table_item
31004e6
 {
31004e6
-#define GRUB_LINUXBIOS_MEMBER_UNUSED		0x00
31004e6
-#define GRUB_LINUXBIOS_MEMBER_MEMORY		0x01
31004e6
-#define GRUB_LINUXBIOS_MEMBER_MAINBOARD		0x03
31004e6
-#define GRUB_LINUXBIOS_MEMBER_CONSOLE           0x10
31004e6
-#define GRUB_LINUXBIOS_MEMBER_LINK              0x11
31004e6
-#define GRUB_LINUXBIOS_MEMBER_TIMESTAMPS        0x16
31004e6
-#define GRUB_LINUXBIOS_MEMBER_CBMEMC            0x17
31004e6
   grub_uint32_t tag;
31004e6
   grub_uint32_t size;
31004e6
 };
31004e6
 typedef struct grub_linuxbios_table_item *grub_linuxbios_table_item_t;
31004e6
 
31004e6
+enum
31004e6
+  {
31004e6
+    GRUB_LINUXBIOS_MEMBER_UNUSED      = 0x00,
31004e6
+    GRUB_LINUXBIOS_MEMBER_MEMORY      = 0x01,
31004e6
+    GRUB_LINUXBIOS_MEMBER_MAINBOARD   = 0x03,
31004e6
+    GRUB_LINUXBIOS_MEMBER_CONSOLE     = 0x10,
31004e6
+    GRUB_LINUXBIOS_MEMBER_LINK        = 0x11,
31004e6
+    GRUB_LINUXBIOS_MEMBER_FRAMEBUFFER = 0x12,
31004e6
+    GRUB_LINUXBIOS_MEMBER_TIMESTAMPS  = 0x16,
31004e6
+    GRUB_LINUXBIOS_MEMBER_CBMEMC      = 0x17
31004e6
+  };
31004e6
+
31004e6
+struct grub_linuxbios_table_framebuffer {
31004e6
+  grub_uint64_t lfb;
31004e6
+  grub_uint32_t width;
31004e6
+  grub_uint32_t height;
31004e6
+  grub_uint32_t pitch;
31004e6
+  grub_uint8_t bpp;
31004e6
+
31004e6
+  grub_uint8_t red_field_pos;
31004e6
+  grub_uint8_t red_mask_size;
31004e6
+  grub_uint8_t green_field_pos;
31004e6
+  grub_uint8_t green_mask_size;
31004e6
+  grub_uint8_t blue_field_pos;
31004e6
+  grub_uint8_t blue_mask_size;
31004e6
+  grub_uint8_t reserved_field_pos;
31004e6
+  grub_uint8_t reserved_mask_size;
31004e6
+};
31004e6
+
31004e6
 struct grub_linuxbios_mem_region
31004e6
 {
31004e6
   grub_uint64_t addr;
31004e6
-- 
31004e6
1.8.2.1
31004e6