4 files changed, 38 insertions, 18 deletions

diff --git a/src/soc/intel/skylake/include/soc/systemagent.h b/src/soc/intel/skylake/include/soc/systemagent.h
index 8e53f54b75..d7dec65f58 100644
--- a/src/soc/intel/skylake/include/soc/systemagent.h
+++ b/src/soc/intel/skylake/include/soc/systemagent.h
@@ -48,9 +48,17 @@
 
 bool soc_is_vtd_capable(void);
 
-static const struct sa_mmio_descriptor soc_vtd_resources[] = {
-	{ GFXVTBAR, GFXVT_BASE_ADDRESS, GFXVT_BASE_SIZE, "GFXVTBAR" },
-	{ VTVC0BAR, VTVC0_BASE_ADDRESS, VTVC0_BASE_SIZE, "VTVC0BAR" },
+static const struct sa_mmio_descriptor soc_gfxvt_mmio_descriptor = {
+	GFXVTBAR,
+	GFXVT_BASE_ADDRESS,
+	GFXVT_BASE_SIZE,
+	"GFXVTBAR"
 };
 
+static const struct sa_mmio_descriptor soc_vtvc0_mmio_descriptor = {
+	VTVC0BAR,
+	VTVC0_BASE_ADDRESS,
+	VTVC0_BASE_SIZE,
+	"VTVC0BAR"
+};
 #endif
diff --git a/src/soc/intel/skylake/romstage/romstage_fsp20.c b/src/soc/intel/skylake/romstage/romstage_fsp20.c
index 1e81d7aa05..c166e3a7c1 100644
--- a/src/soc/intel/skylake/romstage/romstage_fsp20.c
+++ b/src/soc/intel/skylake/romstage/romstage_fsp20.c
@@ -264,14 +264,6 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg,
 	int i;
 	uint32_t mask = 0;
 
-	/*
-	 * Set IGD stolen size to 64MB.  The FBC hardware for skylake does not
-	 * have access to the bios_reserved range so it always assumes 8MB is
-	 * used and so the kernel will avoid the last 8MB of the stolen window.
-	 * With the default stolen size of 32MB(-8MB) there is not enough space
-	 * for FBC to work with a high resolution panel.
-	 */
-	m_cfg->IgdDvmt50PreAlloc = 2;
 	m_cfg->MmioSize = 0x800; /* 2GB in MB */
 	m_cfg->TsegSize = CONFIG_SMM_TSEG_SIZE;
 	m_cfg->IedSize = CONFIG_IED_REGION_SIZE;
@@ -311,12 +303,22 @@ static void soc_primary_gfx_config_params(FSP_M_CONFIG *m_cfg,
 		 * the FSP does not initialize this device
 		 */
 		m_cfg->InternalGfx = 0;
+		m_cfg->IgdDvmt50PreAlloc = 0;
 		if (config->PrimaryDisplay == Display_iGFX)
 			m_cfg->PrimaryDisplay = Display_Auto;
 		else
 			m_cfg->PrimaryDisplay = config->PrimaryDisplay;
 	} else {
 		m_cfg->InternalGfx = 1;
+		/*
+		 * Set IGD stolen size to 64MB.  The FBC hardware for skylake
+		 * does not have access to the bios_reserved range so it always
+		 * assumes 8MB is used and so the kernel will avoid the last
+		 * 8MB of the stolen window. With the default stolen size of
+		 * 32MB(-8MB) there is not enough space for FBC to work with
+		 * a high resolution panel
+		 */
+		m_cfg->IgdDvmt50PreAlloc = 2;
 		m_cfg->PrimaryDisplay = config->PrimaryDisplay;
 	}
 }
diff --git a/src/soc/intel/skylake/romstage/systemagent.c b/src/soc/intel/skylake/romstage/systemagent.c
index 00a2782723..71a9bee1e0 100644
--- a/src/soc/intel/skylake/romstage/systemagent.c
+++ b/src/soc/intel/skylake/romstage/systemagent.c
@@ -26,11 +26,12 @@
 
 static void systemagent_vtd_init(void)
 {
-	const struct device *const dev = dev_find_slot(0, SA_DEVFN_ROOT);
+	const struct device *const root_dev = dev_find_slot(0, SA_DEVFN_ROOT);
+	const struct device *const igd_dev = dev_find_slot(0, SA_DEVFN_IGD);
 	const struct soc_intel_skylake_config *config = NULL;
 
-	if (dev)
-		config = dev->chip_info;
+	if (root_dev)
+		config = root_dev->chip_info;
 	if (config && config->ignore_vtd)
 		return;
 
@@ -39,7 +40,10 @@ static void systemagent_vtd_init(void)
 	if (!vtd_capable)
 		return;
 
-	sa_set_mch_bar(soc_vtd_resources, ARRAY_SIZE(soc_vtd_resources));
+	if (igd_dev && igd_dev->enabled)
+		sa_set_mch_bar(&soc_gfxvt_mmio_descriptor, 1);
+
+	sa_set_mch_bar(&soc_vtvc0_mmio_descriptor, 1);
 }
 
 void systemagent_early_init(void)
diff --git a/src/soc/intel/skylake/systemagent.c b/src/soc/intel/skylake/systemagent.c
index fa0cd5e6db..bfaadfd3a9 100644
--- a/src/soc/intel/skylake/systemagent.c
+++ b/src/soc/intel/skylake/systemagent.c
@@ -42,6 +42,7 @@ bool soc_is_vtd_capable(void)
  */
 void soc_add_fixed_mmio_resources(struct device *dev, int *index)
 {
+	struct device *const igd_dev = SA_DEV_IGD;
 	static const struct sa_mmio_descriptor soc_fixed_resources[] = {
 		{ PCIEXBAR, CONFIG_MMCONF_BASE_ADDRESS, CONFIG_SA_PCIEX_LENGTH,
 				"PCIEXBAR" },
@@ -56,9 +57,14 @@ void soc_add_fixed_mmio_resources(struct device *dev, int *index)
 	sa_add_fixed_mmio_resources(dev, index, soc_fixed_resources,
 			ARRAY_SIZE(soc_fixed_resources));
 
-	if (!(config && config->ignore_vtd) && soc_is_vtd_capable())
-		sa_add_fixed_mmio_resources(dev, index, soc_vtd_resources,
-				ARRAY_SIZE(soc_vtd_resources));
+	if (!(config && config->ignore_vtd) && soc_is_vtd_capable()) {
+		if (igd_dev && igd_dev->enabled)
+			sa_add_fixed_mmio_resources(dev, index,
+					&soc_gfxvt_mmio_descriptor, 1);
+
+		sa_add_fixed_mmio_resources(dev, index,
+				&soc_vtvc0_mmio_descriptor, 1);
+	}
 }
 
 /*