LGA1155 mainboards: Remove gfx.did and gfx.ndid

They are downright useless and result in ACPI errors. So, burn them.
Also, do a minor update to autoport's README about these values.

Change-Id: Idb5832cfd2e3043b8d70e13cbbe8bd94ad613120
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39184
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>

11 files changed, 1 insertions, 22 deletions

diff --git a/src/mainboard/asrock/b75pro3-m/devicetree.cb b/src/mainboard/asrock/b75pro3-m/devicetree.cb
index 32438a102f3c..3fa3dec24e7a 100644
--- a/src/mainboard/asrock/b75pro3-m/devicetree.cb
+++ b/src/mainboard/asrock/b75pro3-m/devicetree.cb
@@ -15,9 +15,7 @@
 #
 
 chip northbridge/intel/sandybridge
-	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }"
 	register "gfx.link_frequency_270_mhz" = "0"
-	register "gfx.ndid" = "3"
 	register "gfx.use_spread_spectrum_clock" = "0"
 	register "gpu_cpu_backlight" = "0x00000000"
 	register "gpu_dp_b_hotplug" = "4"
diff --git a/src/mainboard/asus/p8h61-m_pro/devicetree.cb b/src/mainboard/asus/p8h61-m_pro/devicetree.cb
index ee9a0fc45c13..ea643696eec0 100644
--- a/src/mainboard/asus/p8h61-m_pro/devicetree.cb
+++ b/src/mainboard/asus/p8h61-m_pro/devicetree.cb
@@ -14,8 +14,6 @@
 ##
 
 chip northbridge/intel/sandybridge
-	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }"
-	register "gfx.ndid" = "3"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
diff --git a/src/mainboard/asus/p8z77-m_pro/devicetree.cb b/src/mainboard/asus/p8z77-m_pro/devicetree.cb
index 0bec95c908ce..cbc1629c80c8 100644
--- a/src/mainboard/asus/p8z77-m_pro/devicetree.cb
+++ b/src/mainboard/asus/p8z77-m_pro/devicetree.cb
@@ -14,8 +14,6 @@
 ##
 
 chip northbridge/intel/sandybridge
-	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }"
-	register "gfx.ndid" = "3"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
index e581470daa3e..fbc31b7788f7 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
@@ -1,7 +1,4 @@
 chip northbridge/intel/sandybridge
-	# IGD Displays
-	register "gfx.ndid" = "3"
-	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }"
 
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/devicetree.cb b/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/devicetree.cb
index e4ec810d45d1..317d79744c59 100644
--- a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/devicetree.cb
@@ -14,8 +14,6 @@
 ##
 
 chip northbridge/intel/sandybridge
-	register "gfx.ndid" = "3"
-	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/devicetree.cb b/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/devicetree.cb
index 22d483e12a8a..a11ba0e84eee 100644
--- a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/devicetree.cb
@@ -14,8 +14,6 @@
 ##
 
 chip northbridge/intel/sandybridge
-	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }"
-	register "gfx.ndid" = "3"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
index 915f87d450eb..d8790a81d060 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
+++ b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
@@ -15,9 +15,7 @@
 ##
 
 chip northbridge/intel/sandybridge
-	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }"
 	register "gfx.link_frequency_270_mhz" = "0"
-	register "gfx.ndid" = "3"
 	register "gfx.use_spread_spectrum_clock" = "0"
 	register "gpu_dp_b_hotplug" = "0"
 	register "gpu_dp_c_hotplug" = "0"
diff --git a/src/mainboard/hp/z220_sff_workstation/devicetree.cb b/src/mainboard/hp/z220_sff_workstation/devicetree.cb
index 6823c9fd1f31..a0eed14c54fc 100644
--- a/src/mainboard/hp/z220_sff_workstation/devicetree.cb
+++ b/src/mainboard/hp/z220_sff_workstation/devicetree.cb
@@ -15,9 +15,7 @@
 ##
 
 chip northbridge/intel/sandybridge
-	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }"
 	register "gfx.link_frequency_270_mhz" = "0"
-	register "gfx.ndid" = "3"
 	register "gfx.use_spread_spectrum_clock" = "0"
 	register "gpu_dp_b_hotplug" = "0"
 	register "gpu_dp_c_hotplug" = "0"
diff --git a/src/mainboard/msi/ms7707/devicetree.cb b/src/mainboard/msi/ms7707/devicetree.cb
index 9753c3296bd2..f520ea49e7bb 100644
--- a/src/mainboard/msi/ms7707/devicetree.cb
+++ b/src/mainboard/msi/ms7707/devicetree.cb
@@ -1,7 +1,5 @@
 chip northbridge/intel/sandybridge
-	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }"
 	register "gfx.link_frequency_270_mhz" = "0"
-	register "gfx.ndid" = "3"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
diff --git a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
index 468c35a1570b..9a42a7b45383 100644
--- a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
+++ b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
@@ -15,8 +15,6 @@
 #
 
 chip northbridge/intel/sandybridge
-	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410, 0x80000410, 0x00000005 }"
-	register "gfx.ndid" = "3"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
diff --git a/util/autoport/readme.md b/util/autoport/readme.md
index 9af08f40bc9a..bfaaef6f4e44 100644
--- a/util/autoport/readme.md
+++ b/util/autoport/readme.md
@@ -342,7 +342,7 @@ on laptops (desktops have no "lid"!) but it makes sense to proofread it.
 ## `gfx.ndid` and `gfx.did`
 
 Those describe which video outputs are declared in ACPI tables.
-Normally, there is no need to adjust these values, but if you miss some
+Normally, there is no need to have these values, but if you miss some
 non-standard video output, you can declare it there. Bit 31 is set to
 indicate the presence of the output. Byte 1 is the type and byte 0 is
 used for disambigution so that ID composed of byte 1 and 0 is unique.