Attention is currently required from: Jason Glenesk, Raul Rangel, Matt DeVillier, Fred Reitberger, Felix Held.
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/68148 )
Change subject: soc/amd/*: Hook up GPU ops in devicetree ......................................................................
soc/amd/*: Hook up GPU ops in devicetree
This removes the need for a PCI driver.
Change-Id: I4b499013a80f5c1bd6ac265a5ae8e635598d9e6c Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/amd/cezanne/chipset.cb M src/soc/amd/common/block/graphics/graphics.c M src/soc/amd/mendocino/chipset_mendocino.cb M src/soc/amd/mendocino/chipset_rembrandt.cb M src/soc/amd/picasso/chipset.cb 5 files changed, 17 insertions(+), 22 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/68148/1
diff --git a/src/soc/amd/cezanne/chipset.cb b/src/soc/amd/cezanne/chipset.cb index 3a9bd72..3fb90a7 100644 --- a/src/soc/amd/cezanne/chipset.cb +++ b/src/soc/amd/cezanne/chipset.cb @@ -24,7 +24,7 @@ device pci 08.0 on end # Dummy Host Bridge, do not disable device pci 08.1 alias gpp_bridge_a off # Internal GPP Bridge 0 to Bus A ops amd_internal_pcie_gpp_ops - device pci 0.0 alias gfx off end # Internal GPU (GFX) + device pci 0.0 alias gfx off ops amd_graphics_ops end # Internal GPU (GFX) device pci 0.1 alias gfx_hda off end # Display HD Audio Controller (GFXAZ) device pci 0.2 alias crypto off end # Crypto Coprocessor device pci 0.3 alias xhci_0 off diff --git a/src/soc/amd/common/block/graphics/graphics.c b/src/soc/amd/common/block/graphics/graphics.c index d39f60a..17ca2cd 100644 --- a/src/soc/amd/common/block/graphics/graphics.c +++ b/src/soc/amd/common/block/graphics/graphics.c @@ -4,7 +4,6 @@ #include <acpi/acpigen.h> #include <boot/coreboot_tables.h> #include <device/pci.h> -#include <device/pci_ids.h> #include <console/console.h> #include <fsp/graphics.h> #include <soc/intel/common/vbt.h> @@ -168,7 +167,7 @@ pci_dev_init(dev); }
-static const struct device_operations graphics_ops = { +static const struct device_operations amd_graphics_ops = { .read_resources = pci_dev_read_resources, .set_resources = graphics_set_resources, .enable_resources = pci_dev_enable_resources, @@ -179,19 +178,3 @@ .acpi_fill_ssdt = graphics_fill_ssdt, .acpi_name = graphics_acpi_name, }; - -static const unsigned short pci_device_ids[] = { - PCI_DID_ATI_FAM17H_MODEL18H_GPU, - PCI_DID_ATI_FAM17H_MODEL60H_GPU, - PCI_DID_ATI_FAM17H_MODEL68H_GPU, - PCI_DID_ATI_FAM17H_MODELA0H_GPU, - PCI_DID_ATI_FAM19H_MODEL51H_GPU_CEZANNE, - PCI_DID_ATI_FAM19H_MODEL51H_GPU_BARCELO, - 0, -}; - -static const struct pci_driver graphics_driver __pci_driver = { - .ops = &graphics_ops, - .vendor = PCI_VID_ATI, - .devices = pci_device_ids, -}; diff --git a/src/soc/amd/mendocino/chipset_mendocino.cb b/src/soc/amd/mendocino/chipset_mendocino.cb index 139ee84..83cdbc4 100644 --- a/src/soc/amd/mendocino/chipset_mendocino.cb +++ b/src/soc/amd/mendocino/chipset_mendocino.cb @@ -20,7 +20,7 @@ device pci 08.0 on end # Dummy Host Bridge, do not disable device pci 08.1 alias gpp_bridge_a off # Internal GPP Bridge 0 to Bus A ops amd_internal_pcie_gpp_ops - device pci 0.0 alias gfx off end # Internal GPU (GFX) + device pci 0.0 alias gfx off ops amd_graphics_ops end # Internal GPU (GFX) device pci 0.1 alias gfx_hda off end # Display HD Audio Controller (GFXAZ) device pci 0.2 alias crypto off end # Crypto Coprocessor device pci 0.3 alias xhci_0 off diff --git a/src/soc/amd/mendocino/chipset_rembrandt.cb b/src/soc/amd/mendocino/chipset_rembrandt.cb index e000f40..bfdc04d 100644 --- a/src/soc/amd/mendocino/chipset_rembrandt.cb +++ b/src/soc/amd/mendocino/chipset_rembrandt.cb @@ -20,7 +20,7 @@ device pci 08.0 on end # Dummy Host Bridge, do not disable device pci 08.1 alias gpp_bridge_a off # Internal GPP Bridge 0 to Bus A ops amd_internal_pcie_gpp_ops - device pci 0.0 alias gfx off end # Internal GPU (GFX) + device pci 0.0 alias gfx off ops amd_graphics_ops end # Internal GPU (GFX) device pci 0.1 alias gfx_hda off end # Display HD Audio Controller (GFXAZ) device pci 0.2 alias crypto off end # Crypto Coprocessor device pci 0.3 alias xhci_0 off diff --git a/src/soc/amd/picasso/chipset.cb b/src/soc/amd/picasso/chipset.cb index 756a7f4..ab286de 100644 --- a/src/soc/amd/picasso/chipset.cb +++ b/src/soc/amd/picasso/chipset.cb @@ -19,7 +19,7 @@ device pci 08.0 on end # Dummy Host Bridge, do not disable device pci 08.1 alias internal_bridge_a off # internal bridge to bus A ops amd_internal_pcie_gpp_ops - device pci 0.0 alias gfx off end # internal GPU + device pci 0.0 alias gfx off ops amd_graphics_ops end # internal GPU device pci 0.1 alias gfx_hda off end # display HD Audio controller device pci 0.2 alias crypto off end # cryptography coprocessor device pci 0.3 alias xhci_0 off end
-
Arthur Heymans (Code Review)