[coreboot-gerrit] [S] Change in coreboot[main]: soc/amd/common/block/graphics: Support non VGA IGDs

[Patrick Rudolph (Code Review)]

Attention is currently required from: Felix Held, Fred Reitberger, Jason Glenesk, Matt DeVillier.

Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/86300?usp=email )

Change subject: soc/amd/common/block/graphics: Support non VGA IGDs
......................................................................

soc/amd/common/block/graphics: Support non VGA IGDs

On glinda the IGD is no longer VGA compatible, thus use the
D-segment over C-segment for the VBIOS location.

Introduce a new Kconfig and select it where necessary to keep
existing behaviour on older SoC while fixing FSP GOP init on
glinda.

Change-Id: I6ab28aab74f3169d45d7d852a37ddfcfc75b7c88
Signed-off-by: Patrick Rudolph 
---
M src/soc/amd/cezanne/Kconfig
M src/soc/amd/common/block/graphics/Kconfig
M src/soc/amd/common/block/graphics/graphics.c
M src/soc/amd/mendocino/Kconfig
M src/soc/amd/phoenix/Kconfig
M src/soc/amd/picasso/Kconfig
M src/soc/amd/stoneyridge/Kconfig
7 files changed, 16 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/86300/1

diff --git a/src/soc/amd/cezanne/Kconfig b/src/soc/amd/cezanne/Kconfig
index 7b97ce7..e8705a4 100644
--- a/src/soc/amd/cezanne/Kconfig
+++ b/src/soc/amd/cezanne/Kconfig
@@ -46,6 +46,7 @@
    select SOC_AMD_COMMON_BLOCK_EMMC
    select SOC_AMD_COMMON_BLOCK_GPP_CLK
    select SOC_AMD_COMMON_BLOCK_GRAPHICS
+	select SOC_AMD_COMMON_BLOCK_GRAPHICS_VGA
    select SOC_AMD_COMMON_BLOCK_HAS_ESPI
    select SOC_AMD_COMMON_BLOCK_I2C
    select SOC_AMD_COMMON_BLOCK_I2C_PAD_CTRL
diff --git a/src/soc/amd/common/block/graphics/Kconfig b/src/soc/amd/common/block/graphics/Kconfig
index 3b2eaed..7b9f57b 100644
--- a/src/soc/amd/common/block/graphics/Kconfig
+++ b/src/soc/amd/common/block/graphics/Kconfig
@@ -35,3 +35,10 @@
    help
      Select this option to provide Audio CoProcessor ACPI device for pre-Ryzen APUs for
      use by custom Windows drivers.
+
+config SOC_AMD_COMMON_BLOCK_GRAPHICS_VGA
+	bool
+	depends on SOC_AMD_COMMON_BLOCK_GRAPHICS
+	help
+	  Select this option when the IGD is VGA compatible. On newer platforms the IGD
+	  advertises itself as a Display device, but not VGA Display controller.
diff --git a/src/soc/amd/common/block/graphics/graphics.c b/src/soc/amd/common/block/graphics/graphics.c
index 264cf0f..63fe4b1 100644
--- a/src/soc/amd/common/block/graphics/graphics.c
+++ b/src/soc/amd/common/block/graphics/graphics.c
@@ -151,7 +151,10 @@
    if (!CONFIG(RUN_FSP_GOP))
    	return NULL;

-	return (void *)(uintptr_t)PCI_VGA_RAM_IMAGE_START;
+	if (CONFIG(SOC_AMD_COMMON_BLOCK_GRAPHICS_VGA))
+		return (void *)(uintptr_t)PCI_VGA_RAM_IMAGE_START;
+
+	return (void *)(uintptr_t)PCI_RAM_IMAGE_START;
 }

static void graphics_set_resources(struct device *const dev)
diff --git a/src/soc/amd/mendocino/Kconfig b/src/soc/amd/mendocino/Kconfig
index ee6c968..3fdb20f 100644
--- a/src/soc/amd/mendocino/Kconfig
+++ b/src/soc/amd/mendocino/Kconfig
@@ -50,6 +50,7 @@
    select SOC_AMD_COMMON_BLOCK_ESPI_EXTENDED_DECODE_RANGES
    select SOC_AMD_COMMON_BLOCK_GPP_CLK
    select SOC_AMD_COMMON_BLOCK_GRAPHICS
+	select SOC_AMD_COMMON_BLOCK_GRAPHICS_VGA
    select SOC_AMD_COMMON_BLOCK_HAS_ESPI
    select SOC_AMD_COMMON_BLOCK_HAS_ESPI_ALERT_ENABLE
    select SOC_AMD_COMMON_BLOCK_I2C
diff --git a/src/soc/amd/phoenix/Kconfig b/src/soc/amd/phoenix/Kconfig
index b15c12d..261cf3a 100644
--- a/src/soc/amd/phoenix/Kconfig
+++ b/src/soc/amd/phoenix/Kconfig
@@ -45,6 +45,7 @@
    select SOC_AMD_COMMON_BLOCK_ESPI_EXTENDED_DECODE_RANGES
    select SOC_AMD_COMMON_BLOCK_GPP_CLK
    select SOC_AMD_COMMON_BLOCK_GRAPHICS		# TODO: Check if this is still correct
+	select SOC_AMD_COMMON_BLOCK_GRAPHICS_VGA
    select SOC_AMD_COMMON_BLOCK_HAS_ESPI
    select SOC_AMD_COMMON_BLOCK_HAS_ESPI_ALERT_ENABLE
    select SOC_AMD_COMMON_BLOCK_I2C
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index f450e29..0b61284 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -41,6 +41,7 @@
    select SOC_AMD_COMMON_BLOCK_EMMC_SKIP_POWEROFF
    select SOC_AMD_COMMON_BLOCK_GPP_CLK
    select SOC_AMD_COMMON_BLOCK_GRAPHICS
+	select SOC_AMD_COMMON_BLOCK_GRAPHICS_VGA
    select SOC_AMD_COMMON_BLOCK_HAS_ESPI
    select SOC_AMD_COMMON_BLOCK_HDA
    select SOC_AMD_COMMON_BLOCK_I2C
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig
index 47de102..cd08f58 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -27,6 +27,7 @@
    select SOC_AMD_COMMON_BLOCK_CAR
    select SOC_AMD_COMMON_BLOCK_CPUFREQ_FAM15H_16H
    select SOC_AMD_COMMON_BLOCK_GRAPHICS
+	select SOC_AMD_COMMON_BLOCK_GRAPHICS_VGA
    select SOC_AMD_COMMON_BLOCK_HDA
    select SOC_AMD_COMMON_BLOCK_I2C
    select SOC_AMD_COMMON_BLOCK_IOMMU