aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLajos Molnar <molnar@ti.com>2011-10-10 23:54:09 -0500
committerIliyan Malchev <malchev@google.com>2011-10-17 18:53:54 -0700
commit1aff09744ab64cfa71c9e3f6056d0469f53450f0 (patch)
tree9c51799a0c470ea1c5d0701280ab5d60803ca77e
parent828f971d600f53a5f7690b10975cc6c1939071a0 (diff)
downloadkernel_samsung_tuna-1aff09744ab64cfa71c9e3f6056d0469f53450f0.zip
kernel_samsung_tuna-1aff09744ab64cfa71c9e3f6056d0469f53450f0.tar.gz
kernel_samsung_tuna-1aff09744ab64cfa71c9e3f6056d0469f53450f0.tar.bz2
OMAP4: HDMI: Read up-to 4 EDID blocks
Increased max. EDID length to 516 bytes - which covers 4 EDID blocks. Change-Id: Id7dd9f38c737b750cb56ef0661cec8d66c10990f Signed-off-by: Lajos Molnar <molnar@ti.com>
-rw-r--r--drivers/video/omap2/dss/hdmi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index fa98966..43c4a77 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -50,7 +50,7 @@
#define HDMI_PHY 0x300
/* HDMI EDID Length move this */
-#define HDMI_EDID_MAX_LENGTH 256
+#define HDMI_EDID_MAX_LENGTH 512
#define EDID_TIMING_DESCRIPTOR_SIZE 0x12
#define EDID_DESCRIPTOR_BLOCK0_ADDRESS 0x36
#define EDID_DESCRIPTOR_BLOCK1_ADDRESS 0x80
@@ -268,7 +268,7 @@ u8 *hdmi_read_edid(struct omap_video_timings *dp)
ret = read_ti_4xxx_edid(&hdmi.hdmi_data, hdmi.edid,
HDMI_EDID_MAX_LENGTH);
- for (i = 0; i < 256; i += 16)
+ for (i = 0; i < HDMI_EDID_MAX_LENGTH; i += 16)
pr_info("edid[%03x] = %02x %02x %02x %02x %02x %02x %02x %02x "
"%02x %02x %02x %02x %02x %02x %02x %02x\n", i,
hdmi.edid[i], hdmi.edid[i + 1], hdmi.edid[i + 2],