From 7141ff3b9f836220333ed153b726a6756b3a5f02 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Mon, 10 Oct 2016 17:49:00 +0200 Subject: nb/intel/*/graphic_init: use sizeof instead of hardcoding edid size Change-Id: I2b8c4ef75cca9f9d5251789cda4187a02076b69d Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/16964 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Martin Roth --- src/northbridge/intel/gm45/gma.c | 9 ++++++--- src/northbridge/intel/i945/gma.c | 3 ++- src/northbridge/intel/nehalem/gma.c | 3 ++- src/northbridge/intel/sandybridge/gma_ivybridge_lvds.c | 3 ++- src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c | 3 ++- src/northbridge/intel/x4x/gma.c | 3 ++- 6 files changed, 16 insertions(+), 8 deletions(-) (limited to 'src/northbridge/intel') diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c index 0545ba5964..7e834e6fca 100644 --- a/src/northbridge/intel/gm45/gma.c +++ b/src/northbridge/intel/gm45/gma.c @@ -99,7 +99,8 @@ static void gma_init_lvds(const struct northbridge_intel_gm45_config *info, for (i = 0; i <= 0x18; i++) vga_cr_write(i, cr[i]); - intel_gmbus_read_edid(mmio + GMBUS0, 3, 0x50, edid_data, 128); + intel_gmbus_read_edid(mmio + GMBUS0, 3, 0x50, edid_data, + sizeof(edid_data)); decode_edid(edid_data, sizeof(edid_data), &edid); mode = &edid.mode; @@ -410,7 +411,8 @@ static void gma_init_vga(const struct northbridge_intel_gm45_config *info, udelay(1); - intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, 128); + intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, + sizeof(edid_data)); intel_gmbus_stop(mmio + GMBUS0); decode_edid(edid_data, sizeof(edid_data), &edid); @@ -644,7 +646,8 @@ static u8 vga_connected(u8 *mmio) { u8 vga_edid[128]; u8 header[8] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00}; - intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, 128); + intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, vga_edid, + sizeof(vga_edid)); intel_gmbus_stop(mmio + GMBUS0); for (int i = 0; i < 8; i++) { if (vga_edid[i] != header[i]) { diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c index 3bfb5b13a6..eeb377aaa8 100644 --- a/src/northbridge/intel/i945/gma.c +++ b/src/northbridge/intel/i945/gma.c @@ -103,7 +103,8 @@ static int intel_gma_init_lvds(struct northbridge_intel_i945_config *conf, "i915lightup: graphics %p mmio %p addrport %04x physbase %08x\n", (void *)pgfx, pmmio, piobase, pphysbase); - intel_gmbus_read_edid(pmmio + GMBUS0, 3, 0x50, edid_data, 128); + intel_gmbus_read_edid(pmmio + GMBUS0, 3, 0x50, edid_data, + sizeof(edid_data)); decode_edid(edid_data, sizeof(edid_data), &edid); mode = &edid.mode; diff --git a/src/northbridge/intel/nehalem/gma.c b/src/northbridge/intel/nehalem/gma.c index 3b739294b3..46d867f55a 100644 --- a/src/northbridge/intel/nehalem/gma.c +++ b/src/northbridge/intel/nehalem/gma.c @@ -696,7 +696,8 @@ static void intel_gma_init(const struct northbridge_intel_nehalem_config *info, power_port(mmio); - intel_gmbus_read_edid(mmio + PCH_GMBUS0, 3, 0x50, edid_data, 128); + intel_gmbus_read_edid(mmio + PCH_GMBUS0, 3, 0x50, edid_data, + sizeof(edid_data)); intel_gmbus_stop(mmio + PCH_GMBUS0); decode_edid(edid_data, sizeof(edid_data), &edid); diff --git a/src/northbridge/intel/sandybridge/gma_ivybridge_lvds.c b/src/northbridge/intel/sandybridge/gma_ivybridge_lvds.c index 831e8ce8b5..32becc1983 100644 --- a/src/northbridge/intel/sandybridge/gma_ivybridge_lvds.c +++ b/src/northbridge/intel/sandybridge/gma_ivybridge_lvds.c @@ -202,7 +202,8 @@ int i915lightup_ivy(const struct i915_gpu_controller_info *info, enable_port(mmio); - intel_gmbus_read_edid(mmio + PCH_GMBUS0, 3, 0x50, edid_data, 128); + intel_gmbus_read_edid(mmio + PCH_GMBUS0, 3, 0x50, edid_data, + sizeof(edid_data)); intel_gmbus_stop(mmio + PCH_GMBUS0); decode_edid(edid_data, sizeof(edid_data), &edid); diff --git a/src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c b/src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c index c2c8087b78..756f7bf4f2 100644 --- a/src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c +++ b/src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c @@ -186,7 +186,8 @@ int i915lightup_sandy(const struct i915_gpu_controller_info *info, power_port(mmio); - intel_gmbus_read_edid(mmio + PCH_GMBUS0, 3, 0x50, edid_data, 128); + intel_gmbus_read_edid(mmio + PCH_GMBUS0, 3, 0x50, edid_data, + sizeof(edid_data)); decode_edid(edid_data, sizeof(edid_data), &edid); mode = &edid.mode; diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c index acef053715..e950386d3c 100644 --- a/src/northbridge/intel/x4x/gma.c +++ b/src/northbridge/intel/x4x/gma.c @@ -119,7 +119,8 @@ static void intel_gma_init(const struct northbridge_intel_x4x_config *info, udelay(1); - intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, 128); + intel_gmbus_read_edid(mmio + GMBUS0, 2, 0x50, edid_data, + sizeof(edid_data)); intel_gmbus_stop(mmio + GMBUS0); decode_edid(edid_data, sizeof(edid_data), &edid); -- cgit v1.2.3