diff options
| author | Mono <mono-for-coreboot@donderklumpen.de> | 2015-09-07 21:15:26 +0200 |
|---|---|---|
| committer | Alexandru Gagniuc <mr.nuke.me@gmail.com> | 2015-09-07 21:04:59 +0000 |
| commit | 2e4f83b164d2013e0ed856d8771a00993d1c403e (patch) | |
| tree | bf087402ab8c4de7edd906706efb9852994f9521 /src/northbridge/intel/i945 | |
| parent | c2418552407fee39965ecd6dbad52cb39c76b656 (diff) | |
| download | coreboot-2e4f83b164d2013e0ed856d8771a00993d1c403e.tar.xz | |
intel i945: Fix native VGA initialization
Native VGA init no longer compiles from commit:
* 7dbf9c6 edid: Use edid_mode struct to reduce redundancy
Tested on a single X60 machine.
This patch basically copies 11491 which does
the same for north/intel/sandybridge.
Change-Id: I0663f3b423624c67c2388a9cc44ec41f370f4a17
Signed-off-by: Axel Holewa <mono-for-coreboot@donderklumpen.de>
Reviewed-on: http://review.coreboot.org/11585
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/northbridge/intel/i945')
| -rw-r--r-- | src/northbridge/intel/i945/gma.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c index 437b6ce758..8b70e55cf2 100644 --- a/src/northbridge/intel/i945/gma.c +++ b/src/northbridge/intel/i945/gma.c @@ -85,6 +85,7 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf, void *pmmio, unsigned int pgfx) { struct edid edid; + struct edid_mode *mode; u8 edid_data[128]; unsigned long temp; int hpolarity, vpolarity; @@ -107,19 +108,20 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf, intel_gmbus_read_edid(pmmio + GMBUS0, 3, 0x50, edid_data, 128); decode_edid(edid_data, sizeof(edid_data), &edid); + mode = &edid.mode; - hpolarity = (edid.phsync == '-'); - vpolarity = (edid.pvsync == '-'); + hpolarity = (mode->phsync == '-'); + vpolarity = (mode->pvsync == '-'); hactive = edid.x_resolution; vactive = edid.y_resolution; - right_border = edid.hborder; - bottom_border = edid.vborder; - vblank = edid.vbl; - hblank = edid.hbl; - vsync = edid.vspw; - hsync = edid.hspw; - hfront_porch = edid.hso; - vfront_porch = edid.vso; + right_border = mode->hborder; + bottom_border = mode->vborder; + vblank = mode->vbl; + hblank = mode->hbl; + vsync = mode->vspw; + hsync = mode->hspw; + hfront_porch = mode->hso; + vfront_porch = mode->vso; for (i = 0; i < 2; i++) for (j = 0; j < 0x100; j++) @@ -160,8 +162,8 @@ static int intel_gma_init(struct northbridge_intel_i945_config *conf, write32(pmmio + PORT_HOTPLUG_EN, conf->gpu_hotplug); write32(pmmio + INSTPM, 0x08000000 | INSTPM_AGPBUSY_DIS); - target_frequency = conf->gpu_lvds_is_dual_channel ? edid.pixel_clock - : (2 * edid.pixel_clock); + target_frequency = conf->gpu_lvds_is_dual_channel ? mode->pixel_clock + : (2 * mode->pixel_clock); /* Find suitable divisors. */ for (candp1 = 1; candp1 <= 8; candp1++) { |