[coreboot-gerrit] Change in coreboot[master]: nb/intel/haswell: Simplify GMA SSDT generator

[Matt DeVillier (Code Review)]

Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39948 )

Change subject: nb/intel/haswell: Simplify GMA SSDT generator
......................................................................

nb/intel/haswell: Simplify GMA SSDT generator

Simplify generation of GMA SSDT, using updated naming convention.
If acpi_fill_ssdt_generator is being invoked, then we know the
IGD device is present and enabled, so we can skip those checks.
Only check we need is if a given board has supplied the i915
controller info to populate the SSDT.

Change-Id: Icd9caf622dd4c46b13589ebb772138b25888752f
Signed-off-by: Matt DeVillier 
---
M src/northbridge/intel/haswell/gma.c
1 file changed, 6 insertions(+), 17 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/39948/1

diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c
index 65c5cf3..afb495d 100644
--- a/src/northbridge/intel/haswell/gma.c
+++ b/src/northbridge/intel/haswell/gma.c
@@ -524,24 +524,13 @@
    intel_gma_restore_opregion();
 }

-const struct i915_gpu_controller_info *intel_gma_get_controller_info(void)
+static void gma_generate_ssdt(struct device *device)
 {
-	struct device *dev = pcidev_on_root(2, 0);
-	if (!dev) {
-		return NULL;
-	}
-	struct northbridge_intel_haswell_config *chip = dev->chip_info;
-	return &chip->gfx;
-}
+	const struct northbridge_intel_haswell_config *chip = device->chip_info;
+	const struct i915_gpu_controller_info *gfx = &chip->gfx;

-static void gma_ssdt(struct device *device)
-{
-	const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();
-	if (!gfx) {
-		return;
-	}
-
-	drivers_intel_gma_displays_ssdt_generate(gfx);
+	if (gfx)
+		drivers_intel_gma_displays_ssdt_generate(gfx);
 }

static unsigned long gma_write_acpi_tables(struct device *const dev, unsigned long current,
@@ -577,7 +566,7 @@
    .set_resources            = pci_dev_set_resources,
    .enable_resources         = pci_dev_enable_resources,
    .init                     = gma_func0_init,
-	.acpi_fill_ssdt_generator = gma_ssdt,
+	.acpi_fill_ssdt_generator = gma_generate_ssdt,
    .scan_bus                 = NULL,
    .enable                   = NULL,
    .ops_pci                  = &gma_pci_ops,