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

[Matt DeVillier (Code Review)]

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

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

nb/intel/i945: 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: I68848516fab2058d4aa96ac0342c883fd1df2d6d
Signed-off-by: Matt DeVillier 
---
M src/northbridge/intel/i945/gma.c
1 file changed, 6 insertions(+), 18 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/39958/1

diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
index f4d6aaf..98648c0 100644
--- a/src/northbridge/intel/i945/gma.c
+++ b/src/northbridge/intel/i945/gma.c
@@ -755,25 +755,13 @@
    	pci_write_config8(dev, 0xf4, 0xff);
 }

-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(0x2, 0);
-	if (!dev)
-		return NULL;
-	struct northbridge_intel_i945_config *chip = dev->chip_info;
-	if (!chip)
-		return NULL;
-	return &chip->gfx;
-}
+	const struct northbridge_intel_i945_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 void gma_func0_read_resources(struct device *dev)
@@ -829,7 +817,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		= 0,
    .enable			= 0,
    .disable		= gma_func0_disable,