drivers: Replace multiple fill_lb_framebuffer with single instance

Currently it's not possible to add multiple graphics drivers into
one coreboot image. This patch series will fix this issue by providing
a single API that multiple graphics drivers can use.

This is required for platforms that have two graphic cards, but
different graphic drivers, like Intel+Aspeed on server platforms or
Intel+Nvidia on consumer notebooks.

The goal is to remove duplicated fill_fb_framebuffer(), the advertisment
of multiple independent framebuffers in coreboot tables, and better
runtime/build time graphic configuration options.

Replace all duplications of fill_fb_framebuffer and provide a single one
in edid_fill_fb.c. Should not change the current behaviour as still only
one graphic driver can be active at time.

Change-Id: Ife507f7e7beaf59854e533551b4b87ea6980c1f4
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39003
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
Reviewed-by: Christian Walter <christian.walter@9elements.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

9 files changed, 102 insertions, 169 deletions

diff --git a/src/drivers/intel/fsp1_1/Makefile.inc b/src/drivers/intel/fsp1_1/Makefile.inc
index abac7fba17..b5dd3c3810 100644
--- a/src/drivers/intel/fsp1_1/Makefile.inc
+++ b/src/drivers/intel/fsp1_1/Makefile.inc
@@ -18,7 +18,6 @@ romstage-y += raminit.c
 romstage-y += romstage.c
 romstage-$(CONFIG_MMA) += mma_core.c
 
-ramstage-$(CONFIG_RUN_FSP_GOP) += fsp_gop.c
 ramstage-y += fsp_relocate.c
 ramstage-y += fsp_util.c
 ramstage-y += hob.c
diff --git a/src/drivers/intel/fsp1_1/fsp_gop.c b/src/drivers/intel/fsp1_1/fsp_gop.c
deleted file mode 100644
index 4fcf1e3701..0000000000
--- a/src/drivers/intel/fsp1_1/fsp_gop.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <boot/coreboot_tables.h>
-#include <console/console.h>
-#include <fsp/util.h>
-
-int fill_lb_framebuffer(struct lb_framebuffer *framebuffer)
-{
-	VOID *hob_list_ptr;
-	hob_list_ptr = get_hob_list();
-	const EFI_GUID vbt_guid = EFI_PEI_GRAPHICS_INFO_HOB_GUID;
-	u32 *vbt_hob;
-	EFI_PEI_GRAPHICS_INFO_HOB *vbt_gop;
-	vbt_hob = get_next_guid_hob(&vbt_guid, hob_list_ptr);
-	if (vbt_hob == NULL) {
-		printk(BIOS_ERR, "FSP_ERR: Graphics Data HOB is not present\n");
-		return -1;
-	}
-	printk(BIOS_DEBUG, "FSP_DEBUG: Graphics Data HOB present\n");
-	vbt_gop = GET_GUID_HOB_DATA(vbt_hob);
-
-	framebuffer->physical_address = vbt_gop->FrameBufferBase;
-	framebuffer->x_resolution = vbt_gop->GraphicsMode.HorizontalResolution;
-	framebuffer->y_resolution = vbt_gop->GraphicsMode.VerticalResolution;
-	framebuffer->bytes_per_line = vbt_gop->GraphicsMode.PixelsPerScanLine
-		* 4;
-	framebuffer->bits_per_pixel = 32;
-	framebuffer->red_mask_pos = 16;
-	framebuffer->red_mask_size = 8;
-	framebuffer->green_mask_pos = 8;
-	framebuffer->green_mask_size = 8;
-	framebuffer->blue_mask_pos = 0;
-	framebuffer->blue_mask_size = 8;
-	framebuffer->reserved_mask_pos = 24;
-	framebuffer->reserved_mask_size = 8;
-
-	return 0;
-}
diff --git a/src/drivers/intel/fsp1_1/ramstage.c b/src/drivers/intel/fsp1_1/ramstage.c
index cd4a1e665e..eb226dbb65 100644
--- a/src/drivers/intel/fsp1_1/ramstage.c
+++ b/src/drivers/intel/fsp1_1/ramstage.c
@@ -5,6 +5,7 @@
 #include <console/console.h>
 #include <fsp/ramstage.h>
 #include <fsp/util.h>
+#include <framebuffer_info.h>
 #include <lib.h>
 #include <stage_cache.h>
 #include <string.h>
@@ -116,6 +117,28 @@ void fsp_run_silicon_init(FSP_INFO_HEADER *fsp_info_header, int is_s3_wakeup)
 		gfx_set_init_done(1);
 #endif
 
+	if (CONFIG(RUN_FSP_GOP)) {
+		const EFI_GUID vbt_guid = EFI_PEI_GRAPHICS_INFO_HOB_GUID;
+		u32 *vbt_hob;
+
+		void *hob_list_ptr = get_hob_list();
+		vbt_hob = get_next_guid_hob(&vbt_guid, hob_list_ptr);
+		if (vbt_hob == NULL) {
+			printk(BIOS_ERR, "FSP_ERR: Graphics Data HOB is not present\n");
+		} else {
+			EFI_PEI_GRAPHICS_INFO_HOB *gop;
+
+			printk(BIOS_DEBUG, "FSP_DEBUG: Graphics Data HOB present\n");
+			gop = GET_GUID_HOB_DATA(vbt_hob);
+
+			fb_add_framebuffer_info(gop->FrameBufferBase,
+						gop->GraphicsMode.HorizontalResolution,
+						gop->GraphicsMode.VerticalResolution,
+						gop->GraphicsMode.PixelsPerScanLine * 4,
+						32);
+		}
+	}
+
 	display_hob_info(fsp_info_header);
 	soc_after_silicon_init();
 }
diff --git a/src/drivers/intel/fsp2_0/graphics.c b/src/drivers/intel/fsp2_0/graphics.c
index f6686c4f57..ddf8f0b857 100644
--- a/src/drivers/intel/fsp2_0/graphics.c
+++ b/src/drivers/intel/fsp2_0/graphics.c
@@ -2,9 +2,11 @@
 
 #include <boot/coreboot_tables.h>
 #include <console/console.h>
+#include <fsp/graphics.h>
 #include <fsp/util.h>
 #include <soc/intel/common/vbt.h>
 #include <types.h>
+#include <framebuffer_info.h>
 
 enum pixel_format {
 	pixel_rgbx_8bpc = 0,
@@ -46,75 +48,54 @@ static const struct fsp_framebuffer {
 	[pixel_bgrx_8bpc] = { {16, 8}, {8, 8}, {0, 8}, {24, 8} },
 };
 
-enum cb_err fsp_fill_lb_framebuffer(struct lb_framebuffer *framebuffer)
+
+void fsp_report_framebuffer_info(const uintptr_t framebuffer_bar)
 {
 	size_t size;
 	const struct hob_graphics_info *ginfo;
 	const struct fsp_framebuffer *fbinfo;
 
+	/*
+	 * Pci enumeration happens after silicon init.
+	 * After enumeration graphic framebuffer base may be relocated.
+	 */
+	if (!framebuffer_bar) {
+		printk(BIOS_ALERT, "Framebuffer BAR invalid\n");
+		return;
+	}
+
 	ginfo = fsp_find_extension_hob_by_guid(fsp_graphics_info_guid, &size);
 
 	if (!ginfo) {
 		printk(BIOS_ALERT, "Graphics hand-off block not found\n");
-		return CB_ERR;
+		return;
 	}
 
 	if (ginfo->pixel_format >= ARRAY_SIZE(fsp_framebuffer_format_map)) {
 		printk(BIOS_ALERT, "FSP set unknown framebuffer format: %d\n",
 		       ginfo->pixel_format);
-		return CB_ERR;
+		return;
 	}
 
 	fbinfo = fsp_framebuffer_format_map + ginfo->pixel_format;
 
-	framebuffer->physical_address = ginfo->framebuffer_base;
-	framebuffer->x_resolution = ginfo->horizontal_resolution;
-	framebuffer->y_resolution = ginfo->vertical_resolution;
-	framebuffer->bytes_per_line = ginfo->pixels_per_scanline * 4;
-	framebuffer->bits_per_pixel = 32;
-	framebuffer->red_mask_pos = fbinfo->red.pos;
-	framebuffer->red_mask_size = fbinfo->red.size;
-	framebuffer->green_mask_pos = fbinfo->green.pos;
-	framebuffer->green_mask_size = fbinfo->green.size;
-	framebuffer->blue_mask_pos = fbinfo->blue.pos;
-	framebuffer->blue_mask_size = fbinfo->blue.size;
-	framebuffer->reserved_mask_pos = fbinfo->rsvd.pos;
-	framebuffer->reserved_mask_size = fbinfo->rsvd.pos;
-
-	return CB_SUCCESS;
-}
-
-int fill_lb_framebuffer(struct lb_framebuffer *framebuffer)
-{
-	enum cb_err ret;
-	uintptr_t framebuffer_bar;
-
-	/* Pci enumeration happens after silicon init.
-	 * After enumeration graphic framebuffer base may be relocated.
-	 * Get framebuffer base from soc.
-	 */
-	framebuffer_bar = fsp_soc_get_igd_bar();
-
-	if (!framebuffer_bar) {
-		printk(BIOS_ALERT, "Framebuffer BAR invalid\n");
-		return -1;
-	}
-
-	ret = fsp_fill_lb_framebuffer(framebuffer);
-	if (ret != CB_SUCCESS) {
-		printk(BIOS_ALERT, "FSP did not return a valid framebuffer\n");
-		return -1;
-	}
-
-	/* Resource allocator can move the BAR around after FSP configures it */
-	framebuffer->physical_address = framebuffer_bar;
-	printk(BIOS_DEBUG, "Graphics framebuffer located at 0x%llx\n",
-		framebuffer->physical_address);
-
-	return 0;
-}
-
-__weak uintptr_t fsp_soc_get_igd_bar(void)
-{
-	return 0;
+	const struct lb_framebuffer fb = {
+		.physical_address    = framebuffer_bar,
+		.x_resolution        = ginfo->horizontal_resolution,
+		.y_resolution        = ginfo->vertical_resolution,
+		.bytes_per_line      = ginfo->pixels_per_scanline * 4,
+		.bits_per_pixel      = fbinfo->rsvd.size + fbinfo->red.size +
+				       fbinfo->green.size + fbinfo->blue.size,
+		.red_mask_pos        = fbinfo->red.pos,
+		.red_mask_size       = fbinfo->red.size,
+		.green_mask_pos      = fbinfo->green.pos,
+		.green_mask_size     = fbinfo->green.size,
+		.blue_mask_pos       = fbinfo->blue.pos,
+		.blue_mask_size      = fbinfo->blue.size,
+		.reserved_mask_pos   = fbinfo->rsvd.pos,
+		.reserved_mask_size  = fbinfo->rsvd.size,
+		.orientation         = LB_FB_ORIENTATION_NORMAL,
+	};
+
+	fb_add_framebuffer_info_ex(&fb);
 }
diff --git a/src/drivers/intel/fsp2_0/include/fsp/graphics.h b/src/drivers/intel/fsp2_0/include/fsp/graphics.h
new file mode 100644
index 0000000000..2d8138332f
--- /dev/null
+++ b/src/drivers/intel/fsp2_0/include/fsp/graphics.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef _FSP2_0_GRAPHICS_H_
+#define _FSP2_0_GRAPHICS_H_
+
+#include <types.h>
+
+/*
+ * Report the fsp_graphics_info_guid HOB to framebuffer info.
+ *
+ * Must be called after PCI enumeration to make sure that the BAR
+ * doesn't change any more.
+ */
+void fsp_report_framebuffer_info(const uintptr_t framebuffer_bar);
+
+#endif /* _FSP2_0_GRAPHICS_H_ */
diff --git a/src/drivers/intel/fsp2_0/include/fsp/util.h b/src/drivers/intel/fsp2_0/include/fsp/util.h
index 315db056e9..7393305f0b 100644
--- a/src/drivers/intel/fsp2_0/include/fsp/util.h
+++ b/src/drivers/intel/fsp2_0/include/fsp/util.h
@@ -88,7 +88,6 @@ const void *fsp_get_hob_list(void);
 void *fsp_get_hob_list_ptr(void);
 const void *fsp_find_extension_hob_by_guid(const uint8_t *guid, size_t *size);
 const void *fsp_find_nv_storage_data(size_t *size);
-enum cb_err fsp_fill_lb_framebuffer(struct lb_framebuffer *framebuffer);
 int fsp_find_range_hob(struct range_entry *re, const uint8_t guid[16]);
 void fsp_display_fvi_version_hob(void);
 void fsp_find_reserved_memory(struct range_entry *re);
@@ -123,9 +122,6 @@ struct fsp_load_descriptor {
  * header object will be validated and filled in on successful load. */
 enum cb_err fsp_load_component(struct fsp_load_descriptor *fspld, struct fsp_header *hdr);
 
-/* Get igd framebuffer bar from SoC */
-uintptr_t fsp_soc_get_igd_bar(void);
-
 /*
  * Handle FSP reboot request status. Chipset/soc is expected to provide
  * chipset_handle_reset() that deals with reset type codes specific to given
diff --git a/src/drivers/intel/gma/gma-gfx_init.ads b/src/drivers/intel/gma/gma-gfx_init.ads
index 84c4a5b6db..4998d3312e 100644
--- a/src/drivers/intel/gma/gma-gfx_init.ads
+++ b/src/drivers/intel/gma/gma-gfx_init.ads
@@ -13,28 +13,14 @@ is
 
    ----------------------------------------------------------------------------
 
-   type lb_framebuffer is record
-      tag                  : word32;
-      size                 : word32;
-
-      physical_address     : word64;
-      x_resolution         : word32;
-      y_resolution         : word32;
-      bytes_per_line       : word32;
-      bits_per_pixel       : word8;
-      red_mask_pos         : word8;
-      red_mask_size        : word8;
-      green_mask_pos       : word8;
-      green_mask_size      : word8;
-      blue_mask_pos        : word8;
-      blue_mask_size       : word8;
-      reserved_mask_pos    : word8;
-      reserved_mask_size   : word8;
-   end record;
-
-   function fill_lb_framebuffer
-     (framebuffer : in out lb_framebuffer)
-      return Interfaces.C.int;
-   pragma Export (C, fill_lb_framebuffer, "fill_lb_framebuffer");
+   function c_fb_add_framebuffer_info
+     (fb_addr: Interfaces.C.size_t;
+      x_resolution : word32;
+      y_resolution : word32;
+      bytes_per_line : word32;
+      bits_per_pixel : word8)
+      return Interfaces.C.size_t;
+
+   pragma import (C, c_fb_add_framebuffer_info, "fb_add_framebuffer_info");
 
 end GMA.GFX_Init;
diff --git a/src/drivers/intel/gma/hires_fb/gma-gfx_init.adb b/src/drivers/intel/gma/hires_fb/gma-gfx_init.adb
index 92d3a16963..b213030b2b 100644
--- a/src/drivers/intel/gma/hires_fb/gma-gfx_init.adb
+++ b/src/drivers/intel/gma/hires_fb/gma-gfx_init.adb
@@ -18,56 +18,29 @@ with GMA.Mainboard;
 package body GMA.GFX_Init
 is
 
-   fb_valid : boolean := false;
-
-   linear_fb_addr : word64;
-
-   fb : Framebuffer_Type;
-
-   function fill_lb_framebuffer
-     (framebuffer : in out lb_framebuffer)
-      return Interfaces.C.int
-   is
-      use type word32;
-      use type Interfaces.C.int;
-   begin
-      if fb_valid then
-         framebuffer :=
-           (tag                  =>  0,
-            size                 =>  0,
-            physical_address     => linear_fb_addr,
-            x_resolution         => word32 (fb.Width),
-            y_resolution         => word32 (fb.Height),
-            bytes_per_line       => 4 * word32 (fb.Stride),
-            bits_per_pixel       => 32,
-            reserved_mask_pos    => 24,
-            reserved_mask_size   =>  8,
-            red_mask_pos         => 16,
-            red_mask_size        =>  8,
-            green_mask_pos       =>  8,
-            green_mask_size      =>  8,
-            blue_mask_pos        =>  0,
-            blue_mask_size       =>  8);
-         return 0;
-      else
-         return -1;
-      end if;
-   end fill_lb_framebuffer;
-
    ----------------------------------------------------------------------------
 
    procedure gfxinit (lightup_ok : out Interfaces.C.int)
    is
       use type pos32;
       use type word64;
+      use type word32;
+      use type Interfaces.C.size_t;
 
       ports : Port_List;
       configs : Pipe_Configs;
 
       success : boolean;
 
+      linear_fb_addr : word64;
+
+      fb : Framebuffer_Type;
+
       min_h : pos32 := Config.LINEAR_FRAMEBUFFER_MAX_WIDTH;
       min_v : pos32 := Config.LINEAR_FRAMEBUFFER_MAX_HEIGHT;
+
+      fbinfo : Interfaces.C.size_t;
+
    begin
       lightup_ok := 0;
 
@@ -108,9 +81,17 @@ is
                HW.GFX.GMA.Update_Outputs (configs);
 
                HW.GFX.GMA.Map_Linear_FB (linear_fb_addr, fb);
-               fb_valid := linear_fb_addr /= 0;
-
-               lightup_ok := (if fb_valid then 1 else 0);
+               if linear_fb_addr /= 0 then
+                  fbinfo := c_fb_add_framebuffer_info
+                     (fb_addr        => Interfaces.C.size_t (linear_fb_addr),
+                      x_resolution   => word32 (fb.Width),
+                      y_resolution   => word32 (fb.Height),
+                      bytes_per_line => word32 (fb.Stride) * 4,
+                      bits_per_pixel => 32);
+                  if fbinfo /= 0 then
+                     lightup_ok := 1;
+                  end if;
+               end if;
             end if;
          end if;
       end if;
diff --git a/src/drivers/intel/gma/text_fb/gma-gfx_init.adb b/src/drivers/intel/gma/text_fb/gma-gfx_init.adb
index 04ef30a465..d27385247e 100644
--- a/src/drivers/intel/gma/text_fb/gma-gfx_init.adb
+++ b/src/drivers/intel/gma/text_fb/gma-gfx_init.adb
@@ -13,17 +13,6 @@ with GMA.Mainboard;
 package body GMA.GFX_Init
 is
 
-   function fill_lb_framebuffer
-     (framebuffer : in out lb_framebuffer)
-      return Interfaces.C.int
-   is
-      use type Interfaces.C.int;
-   begin
-      return -1;
-   end fill_lb_framebuffer;
-
-   ----------------------------------------------------------------------------
-
    procedure gfxinit (lightup_ok : out Interfaces.C.int)
    is
       ports : Port_List;