summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2020-04-23 14:01:12 -0700
committerFurquan Shaikh <furquan@google.com>2020-04-28 19:21:30 +0000
commit9e1a49cea530f389c0255dc4555590fbb1abaa26 (patch)
treecf22996d08ec5fa018a272c1b7f186bcc77d850b
parentc82aabca0122c5a118f6ab988768bd05eefc3a05 (diff)
downloadcoreboot-9e1a49cea530f389c0255dc4555590fbb1abaa26.tar.xz
soc/amd/picasso: Use common block graphics driver
This change selects common block graphics driver for Picasso and also adds PCI ID for Family 17h graphics controller to the graphics driver. Since the common driver provides .acpi_name() callback for graphics device, soc_acpi_name() no longer needs to provide the ACPI name for graphics device. BUG=b:153858769 Change-Id: Id3ffcb05d8f8a253a0b27407d52d7907c507cabb Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/40676 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Raul Rangel <rrangel@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-rw-r--r--src/soc/amd/common/block/graphics/graphics.c1
-rw-r--r--src/soc/amd/picasso/Kconfig1
-rw-r--r--src/soc/amd/picasso/chip.c2
3 files changed, 2 insertions, 2 deletions
diff --git a/src/soc/amd/common/block/graphics/graphics.c b/src/soc/amd/common/block/graphics/graphics.c
index 6d40f7c757..880573b11f 100644
--- a/src/soc/amd/common/block/graphics/graphics.c
+++ b/src/soc/amd/common/block/graphics/graphics.c
@@ -21,6 +21,7 @@ static const struct device_operations graphics_ops = {
};
static const unsigned short pci_device_ids[] = {
+ PCI_DEVICE_ID_AMD_FAM17H_GPU,
0,
};
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index c7e65fa57a..3113b27783 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -31,6 +31,7 @@ config CPU_SPECIFIC_OPTIONS
select SOC_AMD_COMMON_BLOCK_ACPIMMIO
select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS
select SOC_AMD_COMMON_BLOCK_ACPI
+ select SOC_AMD_COMMON_BLOCK_GRAPHICS
select SOC_AMD_COMMON_BLOCK_LPC
select SOC_AMD_COMMON_BLOCK_PCI
select SOC_AMD_COMMON_BLOCK_HDA
diff --git a/src/soc/amd/picasso/chip.c b/src/soc/amd/picasso/chip.c
index 7b3e7fba59..4b25b888d6 100644
--- a/src/soc/amd/picasso/chip.c
+++ b/src/soc/amd/picasso/chip.c
@@ -51,8 +51,6 @@ const char *soc_acpi_name(const struct device *dev)
return NULL;
switch (dev->path.pci.devfn) {
- case GFX_DEVFN:
- return "IGFX";
case PCIE0_DEVFN:
return "PBR4";
case PCIE1_DEVFN: