3 files changed, 34 insertions, 0 deletions
diff --git a/src/mainboard/prodrive/hermes/eeprom.h b/src/mainboard/prodrive/hermes/eeprom.h
index 6befd8e333..f02206f9bc 100644
--- a/src/mainboard/prodrive/hermes/eeprom.h
+++ b/src/mainboard/prodrive/hermes/eeprom.h
@@ -65,6 +65,11 @@ struct __packed eeprom_board_settings {
 	};
 };
 
+enum {
+	PRIMARY_VIDEO_ASPEED = 0,
+	PRIMARY_VIDEO_INTEL  = 1,
+};
+
 _Static_assert(sizeof(struct eeprom_board_settings) == (12 + sizeof(uint32_t)),
 		"struct eeprom_board_settings has invalid size!");
 
diff --git a/src/mainboard/prodrive/hermes/mainboard.c b/src/mainboard/prodrive/hermes/mainboard.c
index 64494b175a..b85186d3e7 100644
--- a/src/mainboard/prodrive/hermes/mainboard.c
+++ b/src/mainboard/prodrive/hermes/mainboard.c
@@ -8,6 +8,7 @@
 #include <crc_byte.h>
 #include <device/device.h>
 #include <device/dram/spd.h>
+#include <device/pci_ids.h>
 #include <drivers/intel/gma/opregion.h>
 #include <gpio.h>
 #include <intelblocks/gpio.h>
@@ -302,3 +303,26 @@ static void mainboard_early(void *unused)
 }
 
 BOOT_STATE_INIT_ENTRY(BS_PRE_DEVICE, BS_ON_EXIT, mainboard_early, NULL);
+
+/*
+ * coreboot only exposes the last framebuffer that is set up.
+ * The ASPEED BMC will always be initialized after the IGD due to its higher
+ * bus number. To have coreboot only expose the IGD framebuffer skip the init
+ * function on the ASPEED.
+ */
+static void mainboard_configure_internal_gfx(void *unused)
+{
+	struct device *dev;
+	const struct eeprom_board_settings *board_cfg = get_board_settings();
+	if (!board_cfg)
+		return;
+
+	if (board_cfg->primary_video == PRIMARY_VIDEO_INTEL) {
+		dev = dev_find_device(PCI_VID_ASPEED, PCI_DID_ASPEED_AST2050_VGA, NULL);
+		dev->on_mainboard = false;
+		dev->enabled = false;
+		dev->ops->init = NULL;
+	}
+}
+
+BOOT_STATE_INIT_ENTRY(BS_DEV_RESOURCES, BS_ON_ENTRY, mainboard_configure_internal_gfx, NULL)
diff --git a/src/mainboard/prodrive/hermes/romstage.c b/src/mainboard/prodrive/hermes/romstage.c
index b52c52c489..985342678a 100644
--- a/src/mainboard/prodrive/hermes/romstage.c
+++ b/src/mainboard/prodrive/hermes/romstage.c
@@ -46,6 +46,11 @@ void mainboard_memory_init_params(FSPM_UPD *memupd)
 	memupd->FspmTestConfig.SmbusSpdWriteDisable = 0;
 	cannonlake_memcfg_init(&memupd->FspmConfig, &baseboard_mem_cfg);
 
+	/* Tell FSP-M about the desired primary video adapter so that GGC is set up properly */
+	const struct eeprom_board_settings *board_cfg = get_board_settings();
+	if (board_cfg && board_cfg->primary_video == PRIMARY_VIDEO_INTEL)
+		memupd->FspmConfig.PrimaryDisplay = 0; /* iGPU is primary */
+
 	/* Overwrite memupd */
 	if (!check_signature(offsetof(struct eeprom_layout, mupd), FSPM_UPD_SIGNATURE))
 		return;