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