summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoolStar <coolstarorganization@gmail.com>2023-10-17 00:30:19 -0700
committerMatt DeVillier <matt.devillier@amd.corp-partner.google.com>2023-10-24 16:04:25 +0000
commit835af76fbbd91a4639451aa2cc14d3528b95ff08 (patch)
treedd64e413d7994ff9601d36c5e123bb5e05b98f44
parentb92148390ceb51db191478087bc8bfe82518e4f8 (diff)
soc/amd/stoneyridge: Use common block graphics driver
Select the common block graphics driver for Stoneyridge. Drop Stoney's ACPI stub for the iGPU as the device will now be generated by the common block acpigen and put into the SSDT. TEST=tested with rest of patch train Change-Id: I260b964be59c1a208ff907c474243a9ace03f206 Signed-off-by: CoolStar <coolstarorganization@gmail.com> Signed-off-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/78428 Reviewed-by: Felix Held <felix-coreboot@felixheld.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/soc/amd/stoneyridge/Kconfig1
-rw-r--r--src/soc/amd/stoneyridge/acpi/northbridge.asl5
-rw-r--r--src/soc/amd/stoneyridge/chipset_cz.cb2
-rw-r--r--src/soc/amd/stoneyridge/chipset_st.cb2
4 files changed, 3 insertions, 7 deletions
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig
index bd55b71f0f..5e00785c1e 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -25,6 +25,7 @@ config SOC_AMD_STONEYRIDGE
select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS
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_HDA
select SOC_AMD_COMMON_BLOCK_I2C
select SOC_AMD_COMMON_BLOCK_IOMMU
diff --git a/src/soc/amd/stoneyridge/acpi/northbridge.asl b/src/soc/amd/stoneyridge/acpi/northbridge.asl
index 6bf229329d..322e228c74 100644
--- a/src/soc/amd/stoneyridge/acpi/northbridge.asl
+++ b/src/soc/amd/stoneyridge/acpi/northbridge.asl
@@ -24,11 +24,6 @@ Device(AMRT) {
Name(_ADR, 0x00000000)
} /* end AMRT */
-/* Internal Graphics */
-Device(IGFX) {
- Name(_ADR, 0x00010000)
-}
-
/* Gpp 0 */
Device(PBR4) {
Name(_ADR, 0x00020001)
diff --git a/src/soc/amd/stoneyridge/chipset_cz.cb b/src/soc/amd/stoneyridge/chipset_cz.cb
index 004ff9134c..1122ae8330 100644
--- a/src/soc/amd/stoneyridge/chipset_cz.cb
+++ b/src/soc/amd/stoneyridge/chipset_cz.cb
@@ -8,7 +8,7 @@ chip soc/amd/stoneyridge
ops stoneyridge_pci_domain_ops
device pci 00.0 alias gnb on ops stoneyridge_northbridge_operations end
device pci 00.2 alias iommu off ops amd_iommu_ops end
- device pci 01.0 alias gfx off end # internal GPU
+ device pci 01.0 alias gfx off ops amd_graphics_ops end # internal GPU
device pci 01.1 alias gfx_hda off end # display HD Audio controller
device pci 02.0 on end # Dummy Host Bridge, do not disable
device pci 02.1 alias gpp_bridge_0 off end
diff --git a/src/soc/amd/stoneyridge/chipset_st.cb b/src/soc/amd/stoneyridge/chipset_st.cb
index 34a0384e34..fd148a88d6 100644
--- a/src/soc/amd/stoneyridge/chipset_st.cb
+++ b/src/soc/amd/stoneyridge/chipset_st.cb
@@ -8,7 +8,7 @@ chip soc/amd/stoneyridge
ops stoneyridge_pci_domain_ops
device pci 00.0 alias gnb on ops stoneyridge_northbridge_operations end
device pci 00.2 alias iommu off ops amd_iommu_ops end
- device pci 01.0 alias gfx off end # internal GPU
+ device pci 01.0 alias gfx off ops amd_graphics_ops end # internal GPU
device pci 01.1 alias gfx_hda off end # display HD Audio controller
device pci 02.0 on end # Dummy Host Bridge, do not disable
device pci 02.1 alias gpp_bridge_0 off end