Change in coreboot[master]: soc/amd/common/block/graphics: Don't add VBIOS to cbmem when using GOP

[Martin Roth (Code Review)]

Martin Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/51541 )

Change subject: soc/amd/common/block/graphics: Don't add VBIOS to cbmem when using GOP
......................................................................

soc/amd/common/block/graphics: Don't add VBIOS to cbmem when using GOP

pci_rom_ssdt reloads the oprom from cbfs. It then places it into cbmem
and writes the offsets as the ROM ACPI node. The GOP driver modifies the
VBIOS so we don't want to reread from cbfs. When using GOP we also pass
the offsets with the VFCT table.

Signed-off-by: Raul E Rangel 
Change-Id: Iaf53e750564f1f0e115cd354790da62e672d74b7
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51541
Tested-by: build bot (Jenkins) 
Reviewed-by: Nikolai Vyssotski 
Reviewed-by: Martin Roth 
---
M src/soc/amd/common/block/graphics/graphics.c
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Martin Roth: Looks good to me, approved
  Nikolai Vyssotski: Looks good to me, but someone else must approve

diff --git a/src/soc/amd/common/block/graphics/graphics.c b/src/soc/amd/common/block/graphics/graphics.c
index 82b437b..071dfcc 100644
--- a/src/soc/amd/common/block/graphics/graphics.c
+++ b/src/soc/amd/common/block/graphics/graphics.c
@@ -108,7 +108,11 @@
 static void graphics_fill_ssdt(const struct device *dev)
 {
    acpi_device_write_pci_dev(dev);
-	pci_rom_ssdt(dev);
+
+	/* Use the VFCT copy when using GOP */
+	if (!CONFIG(RUN_FSP_GOP))
+		pci_rom_ssdt(dev);
+
    if (CONFIG(SOC_AMD_COMMON_BLOCK_GRAPHICS_ATIF))
    	generate_atif(dev);
 }