<p>Arthur Heymans has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20889">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nb/intel/*/gma.c: Use macros for GMBUS numbers<br><br>Change-Id: I885b6bd9f5be6b4e3696a530016123a3e81c4b10<br>Signed-off-by: Arthur Heymans <arthur@aheymans.xyz><br>---<br>M src/northbridge/intel/gm45/gma.c<br>M src/northbridge/intel/i945/gma.c<br>M src/northbridge/intel/nehalem/gma.c<br>M src/northbridge/intel/sandybridge/gma_ivybridge_lvds.c<br>M src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c<br>M src/northbridge/intel/x4x/gma.c<br>6 files changed, 15 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/20889/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c<br>index 2404671..91aa700 100644<br>--- a/src/northbridge/intel/gm45/gma.c<br>+++ b/src/northbridge/intel/gm45/gma.c<br>@@ -588,8 +588,8 @@<br> <br> mmio = res2mmio(gtt_res, 0, 0);<br> printk(BIOS_DEBUG, "VGA EDID\n");<br>- intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data_vga,<br>- sizeof(edid_data_vga));<br>+ intel_gmbus_read_edid(mmio + GMBUS0, GMBUS_PORT_VGADDC, 0x50,<br>+ edid_data_vga, sizeof(edid_data_vga));<br> intel_gmbus_stop(mmio + GMBUS0);<br> vga_edid_status = decode_edid(edid_data_vga,<br> sizeof(edid_data_vga), &edid_vga);<br>@@ -748,7 +748,8 @@<br> }<br> <br> printk(BIOS_DEBUG, "LVDS EDID\n");<br>- intel_gmbus_read_edid(mmio + GMBUS0, 3, 0x50, edid_data_lvds,<br>+ intel_gmbus_read_edid(mmio + GMBUS0, GMBUS_PORT_PANEL, 0x50,<br>+ edid_data_lvds,<br> sizeof(edid_data_lvds));<br> intel_gmbus_stop(mmio + GMBUS0);<br> decode_edid(edid_data_lvds, sizeof(edid_data_lvds), &edid_lvds);<br>diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c<br>index cba2860..37f73ed 100644<br>--- a/src/northbridge/intel/i945/gma.c<br>+++ b/src/northbridge/intel/i945/gma.c<br>@@ -104,8 +104,8 @@<br> "i915lightup: graphics %p mmio %p addrport %04x physbase %08x\n",<br> (void *)pgfx, mmiobase, piobase, pphysbase);<br> <br>- intel_gmbus_read_edid(mmiobase + GMBUS0, 3, 0x50, edid_data,<br>- sizeof(edid_data));<br>+ intel_gmbus_read_edid(mmiobase + GMBUS0, GMBUS_PORT_PANEL, 0x50,<br>+ edid_data, sizeof(edid_data));<br> decode_edid(edid_data, sizeof(edid_data), &edid);<br> mode = &edid.mode;<br> <br>@@ -663,7 +663,8 @@<br> <br> /* probe if VGA is connected and always run */<br> /* VGA init if no LVDS is connected */<br>- if (!probe_edid(mmiobase, 3) || probe_edid(mmiobase, 2))<br>+ if (!probe_edid(mmiobase, GMBUS_PORT_PANEL) ||<br>+ probe_edid(mmiobase, GMBUS_PORT_VGADDC))<br> err = intel_gma_init_vga(conf,<br> pci_read_config32(dev, 0x5c) & ~0xf,<br> iobase, mmiobase, graphics_base);<br>diff --git a/src/northbridge/intel/nehalem/gma.c b/src/northbridge/intel/nehalem/gma.c<br>index 0607f34..56d8523 100644<br>--- a/src/northbridge/intel/nehalem/gma.c<br>+++ b/src/northbridge/intel/nehalem/gma.c<br>@@ -712,8 +712,8 @@<br> <br> power_port(mmio);<br> <br>- intel_gmbus_read_edid(mmio + PCH_GMBUS0, 3, 0x50, edid_data,<br>- sizeof(edid_data));<br>+ intel_gmbus_read_edid(mmio + PCH_GMBUS0, GMBUS_PORT_PANEL, 0x50,<br>+ edid_data, sizeof(edid_data));<br> intel_gmbus_stop(mmio + PCH_GMBUS0);<br> decode_edid(edid_data,<br> sizeof(edid_data), &edid);<br>diff --git a/src/northbridge/intel/sandybridge/gma_ivybridge_lvds.c b/src/northbridge/intel/sandybridge/gma_ivybridge_lvds.c<br>index cad5078..23ecd44 100644<br>--- a/src/northbridge/intel/sandybridge/gma_ivybridge_lvds.c<br>+++ b/src/northbridge/intel/sandybridge/gma_ivybridge_lvds.c<br>@@ -182,8 +182,8 @@<br> <br> enable_port(mmio);<br> <br>- intel_gmbus_read_edid(mmio + PCH_GMBUS0, 3, 0x50, edid_data,<br>- sizeof(edid_data));<br>+ intel_gmbus_read_edid(mmio + PCH_GMBUS0, GMBUS_PORT_PANEL, 0x50,<br>+ edid_data, sizeof(edid_data));<br> intel_gmbus_stop(mmio + PCH_GMBUS0);<br> decode_edid(edid_data,<br> sizeof(edid_data), &edid);<br>diff --git a/src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c b/src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c<br>index c3139a9..5e8c188 100644<br>--- a/src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c<br>+++ b/src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c<br>@@ -176,8 +176,8 @@<br> <br> power_port(mmio);<br> <br>- intel_gmbus_read_edid(mmio + PCH_GMBUS0, 3, 0x50, edid_data,<br>- sizeof(edid_data));<br>+ intel_gmbus_read_edid(mmio + PCH_GMBUS0, GMBUS_PORT_PANEL, 0x50,<br>+ edid_data, sizeof(edid_data));<br> decode_edid(edid_data, sizeof(edid_data), &edid);<br> mode = &edid.mode;<br> <br>diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c<br>index 561e776..e91d778 100644<br>--- a/src/northbridge/intel/x4x/gma.c<br>+++ b/src/northbridge/intel/x4x/gma.c<br>@@ -113,7 +113,7 @@<br> <br> udelay(1);<br> <br>- intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data,<br>+ intel_gmbus_read_edid(mmio + GMBUS0, GMBUS_PORT_VGADDC, 0x50, edid_data,<br> sizeof(edid_data));<br> intel_gmbus_stop(mmio + GMBUS0);<br> decode_edid(edid_data,<br></pre><p>To view, visit <a href="https://review.coreboot.org/20889">change 20889</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/20889"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I885b6bd9f5be6b4e3696a530016123a3e81c4b10 </div>
<div style="display:none"> Gerrit-Change-Number: 20889 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz> </div>