[coreboot-gerrit] Patch set updated for coreboot: 34a7959 sandybridge: Pass chip info to i915lightup.

[Vladimir Serbinenko]

Vladimir Serbinenko ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5284

-gerrit

commit 34a7959d43344abeb9fc362104ff0d2781a2b37c
Author: Vladimir Serbinenko 
Date:   Sun Feb 23 00:09:48 2014 +0100

sandybridge: Pass chip info to i915lightup.

Change-Id: I280441aadb0575dc0b99584cdcd48cc76a0289a2
    Signed-off-by: Vladimir Serbinenko 
---
 src/mainboard/google/link/i915.c        | 8 +++-----
 src/northbridge/intel/sandybridge/gma.c | 4 ++--
 src/northbridge/intel/sandybridge/gma.h | 5 +++++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/mainboard/google/link/i915.c b/src/mainboard/google/link/i915.c
index 2b62bf4..657e6cd 100644
--- a/src/mainboard/google/link/i915.c
+++ b/src/mainboard/google/link/i915.c
@@ -35,6 +35,7 @@
 #include "onboard.h"
 #include "ec.h"
 #include <southbridge/intel/bd82x6x/pch.h>
+#include <northbridge/intel/sandybridge/gma.h>
 #include <smbios.h>
 #include <device/pci.h>
 #include <ec/google/chromeec/ec.h>
@@ -235,11 +236,8 @@ static int run(int index)
    return i+1;
 }

-int i915lightup(unsigned int physbase, unsigned int iobase, unsigned int mmio,
-		unsigned int gfx);
-
-int i915lightup(unsigned int pphysbase, unsigned int piobase,
-		unsigned int pmmio, unsigned int pgfx)
+void intel_gma_init(const struct northbridge_intel_sandybridge_config *info,
+		    u32 pphysbase, u16 piobase, u32 pmmio, u32 pgfx)
 {
    static struct edid edid;
    int edid_ok;
diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c
index 2d8bd77..d271a1a 100644
--- a/src/northbridge/intel/sandybridge/gma.c
+++ b/src/northbridge/intel/sandybridge/gma.c
@@ -644,13 +644,13 @@ static void gma_func0_init(struct device *dev)
    /* This should probably run before post VBIOS init. */
    printk(BIOS_SPEW, "Initializing VGA without OPROM.\n");
    u32 iobase, mmiobase, physbase, graphics_base;
+	struct northbridge_intel_sandybridge_config *conf = dev->chip_info;
    iobase = dev->resource_list[2].base;
    mmiobase = dev->resource_list[0].base;
    physbase = pci_read_config32(dev, 0x5c) & ~0xf;
    graphics_base = dev->resource_list[1].base;

-	int i915lightup(u32 physbase, u32 iobase, u32 mmiobase, u32 gfx);
-	int lightup_ok = i915lightup(physbase, iobase, mmiobase, graphics_base);
+	int lightup_ok = i915lightup(conf, physbase, iobase, mmiobase, graphics_base);
    if (lightup_ok)
    	gfx_set_init_done(1);
 #endif
diff --git a/src/northbridge/intel/sandybridge/gma.h b/src/northbridge/intel/sandybridge/gma.h
index bfa43ef..f128412 100644
--- a/src/northbridge/intel/sandybridge/gma.h
+++ b/src/northbridge/intel/sandybridge/gma.h
@@ -166,3 +166,8 @@ typedef struct {

#define VBT_SIGNATURE 0x54425624

+struct northbridge_intel_sandybridge_config;
+
+void i915lightup(const struct northbridge_intel_sandybridge_config *info,
+		 u32 physbase, u16 pio, u32 mmio, u32 lfb);
+