GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/intel/*/gma.c: Use macros for GMBUS numbers 

Change-Id: I885b6bd9f5be6b4e3696a530016123a3e81c4b10
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/20889
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Arthur Heymans 2017-08-06 15:56:30 +02:00 committed by Nico Huber
parent 6aea6f7a6b
commit 8da2286885
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/northbridge/intel/gm45/gma.c
View File

@ -588,8 +588,8 @@ static void gma_ngi(struct device *const dev, struct edid *edid_lvds)
mmio = res2mmio(gtt_res, 0, 0); mmio = res2mmio(gtt_res, 0, 0);
printk(BIOS_DEBUG, "VGA EDID\n"); printk(BIOS_DEBUG, "VGA EDID\n");
intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data_vga, intel_gmbus_read_edid(mmio + GMBUS0, GMBUS_PORT_VGADDC, 0x50,
sizeof(edid_data_vga)); edid_data_vga, sizeof(edid_data_vga));
intel_gmbus_stop(mmio + GMBUS0); intel_gmbus_stop(mmio + GMBUS0);
vga_edid_status = decode_edid(edid_data_vga, vga_edid_status = decode_edid(edid_data_vga,
sizeof(edid_data_vga), &edid_vga); sizeof(edid_data_vga), &edid_vga);
@ -748,8 +748,8 @@ static void gma_func0_init(struct device *dev)
} }
printk(BIOS_DEBUG, "LVDS EDID\n"); printk(BIOS_DEBUG, "LVDS EDID\n");
intel_gmbus_read_edid(mmio + GMBUS0, 3, 0x50, edid_data_lvds, intel_gmbus_read_edid(mmio + GMBUS0, GMBUS_PORT_PANEL, 0x50,
sizeof(edid_data_lvds)); edid_data_lvds, sizeof(edid_data_lvds));
intel_gmbus_stop(mmio + GMBUS0); intel_gmbus_stop(mmio + GMBUS0);
decode_edid(edid_data_lvds, sizeof(edid_data_lvds), &edid_lvds); decode_edid(edid_data_lvds, sizeof(edid_data_lvds), &edid_lvds);

7
src/northbridge/intel/i945/gma.c
View File

@ -104,8 +104,8 @@ static int intel_gma_init_lvds(struct northbridge_intel_i945_config *conf,
"i915lightup: graphics %p mmio %p addrport %04x physbase %08x\n", "i915lightup: graphics %p mmio %p addrport %04x physbase %08x\n",
(void *)pgfx, mmiobase, piobase, pphysbase); (void *)pgfx, mmiobase, piobase, pphysbase);
intel_gmbus_read_edid(mmiobase + GMBUS0, 3, 0x50, edid_data, intel_gmbus_read_edid(mmiobase + GMBUS0, GMBUS_PORT_PANEL, 0x50,
sizeof(edid_data)); edid_data, sizeof(edid_data));
decode_edid(edid_data, sizeof(edid_data), &edid); decode_edid(edid_data, sizeof(edid_data), &edid);
mode = &edid.mode; mode = &edid.mode;
@ -663,7 +663,8 @@ static void gma_func0_init(struct device *dev)
/* probe if VGA is connected and always run */ /* probe if VGA is connected and always run */
/* VGA init if no LVDS is connected */ /* VGA init if no LVDS is connected */
if (!probe_edid(mmiobase, 3) || probe_edid(mmiobase, 2)) if (!probe_edid(mmiobase, GMBUS_PORT_PANEL) ||
probe_edid(mmiobase, GMBUS_PORT_VGADDC))
err = intel_gma_init_vga(conf, err = intel_gma_init_vga(conf,
pci_read_config32(dev, 0x5c) & ~0xf, pci_read_config32(dev, 0x5c) & ~0xf,
iobase, mmiobase, graphics_base); iobase, mmiobase, graphics_base);

4
src/northbridge/intel/nehalem/gma.c
View File

@ -712,8 +712,8 @@ static void intel_gma_init(const struct northbridge_intel_nehalem_config *info,
power_port(mmio); power_port(mmio);
intel_gmbus_read_edid(mmio + PCH_GMBUS0, 3, 0x50, edid_data, intel_gmbus_read_edid(mmio + PCH_GMBUS0, GMBUS_PORT_PANEL, 0x50,
sizeof(edid_data)); edid_data, sizeof(edid_data));
intel_gmbus_stop(mmio + PCH_GMBUS0); intel_gmbus_stop(mmio + PCH_GMBUS0);
decode_edid(edid_data, decode_edid(edid_data,
sizeof(edid_data), &edid); sizeof(edid_data), &edid);

4
src/northbridge/intel/sandybridge/gma_ivybridge_lvds.c
View File

@ -182,8 +182,8 @@ int i915lightup_ivy(const struct i915_gpu_controller_info *info,
enable_port(mmio); enable_port(mmio);
intel_gmbus_read_edid(mmio + PCH_GMBUS0, 3, 0x50, edid_data, intel_gmbus_read_edid(mmio + PCH_GMBUS0, GMBUS_PORT_PANEL, 0x50,
sizeof(edid_data)); edid_data, sizeof(edid_data));
intel_gmbus_stop(mmio + PCH_GMBUS0); intel_gmbus_stop(mmio + PCH_GMBUS0);
decode_edid(edid_data, decode_edid(edid_data,
sizeof(edid_data), &edid); sizeof(edid_data), &edid);

4
src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c
View File

@ -176,8 +176,8 @@ int i915lightup_sandy(const struct i915_gpu_controller_info *info,
power_port(mmio); power_port(mmio);
intel_gmbus_read_edid(mmio + PCH_GMBUS0, 3, 0x50, edid_data, intel_gmbus_read_edid(mmio + PCH_GMBUS0, GMBUS_PORT_PANEL, 0x50,
sizeof(edid_data)); edid_data, sizeof(edid_data));
decode_edid(edid_data, sizeof(edid_data), &edid); decode_edid(edid_data, sizeof(edid_data), &edid);
mode = &edid.mode; mode = &edid.mode;

2
src/northbridge/intel/x4x/gma.c
View File

@ -113,7 +113,7 @@ static void intel_gma_init(const struct northbridge_intel_x4x_config *info,
udelay(1); udelay(1);
intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, intel_gmbus_read_edid(mmio + GMBUS0, GMBUS_PORT_VGADDC, 0x50, edid_data,
sizeof(edid_data)); sizeof(edid_data));
intel_gmbus_stop(mmio + GMBUS0); intel_gmbus_stop(mmio + GMBUS0);
decode_edid(edid_data, decode_edid(edid_data,