soc/amd/picasso/graphics: implement map_oprom_vendev_rev
Picasso, Dali, and Pollock iGPU share the same PCI device ID, but need
different video BIOSes. This checks the vendor & device IDs along with
the revision and selects the correct video BIOS to use.
Also add the second VGA BIOS for Raven2-based SoCs and change all VGA
BIOS IDs to the format including the revision number.
Since SeaBIOS still expects the CBFS file name without the revision ID,
it won't find the VBIOS any more. As a temporary workaround add the
VBIOS for the silicon it will run on as VGA_BIOS_DGPU_*.
Change-Id: I8f48ecc3fbffddd21d1f830fbee26a09ac351e1c
Signed-off-by: Martin Roth <martinroth@chromium.org>
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://chromium-review.googlesource.com/2040455
Reviewed-by: Raul E Rangel <rrangel@chromium.org>
Reviewed-by: Matt Papageorge <matt.papageorge@amd.corp-partner.google.com>
Reviewed-by: Justin Frodsham <justin.frodsham@amd.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41562
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 27901ba..e23cfd8 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -194,15 +194,41 @@
config VGA_BIOS_ID
string
- default "1002,15d8"
+ default "1002,15d8,c1"
help
The default VGA BIOS PCI vendor/device ID should be set to the
- result of the map_oprom_vendev() function in northbridge.c.
+ result of the map_oprom_vendev_rev() function in northbridge.c.
config VGA_BIOS_FILE
string
default "3rdparty/amd_blobs/picasso/PicassoGenericVbios.bin"
+config VGA_BIOS_SECOND
+ def_bool y
+
+config VGA_BIOS_SECOND_ID
+ string
+ default "1002,15dd,c4"
+ help
+ Because Dali and Picasso need different video BIOSes, but have the
+ same vendor/device IDs, we need an alternate method to determine the
+ correct video BIOS. In map_oprom_vendev_rev(), we look at the cpuid
+ and decide which rom to load.
+
+ Even though the hardware has the same vendor/device IDs, the vBIOS
+ contains a *different* device ID, confusing the situation even more.
+
+config VGA_BIOS_SECOND_FILE
+ string
+ default "3rdparty/amd_blobs/picasso/Raven2GenericVbios.bin"
+
+config CHECK_REV_IN_OPROM_NAME
+ bool
+ default y
+ help
+ Select this in the platform BIOS or chipset if the option rom has a
+ revision that needs to be checked when searching CBFS.
+
config S3_VGA_ROM_RUN
bool
default n