summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2012-12-31 20:30:55 +0400
committerAlejandro Mery <amery@geeks.cl>2013-01-03 23:58:04 +0400
commitb26bb91b9b68c1c84b0c31df00499545407ac7a5 (patch)
tree7a4e7fc06fb4d2431498e084eb758c7a8d374eda
parentfdc266ff7224c9d284cea0da60afcaa46ce7d57c (diff)
downloadlinux-sunxi-b26bb91b9b68c1c84b0c31df00499545407ac7a5.tar.xz
sunxi-hdmi: Allow EDID info < 1.3
But only if the preferred timing feature bit is set, so that we know the first DTD contains the preferred mode for the monitor. Reported-by: Robin Humble <robin.humble+sunxi@anu.edu.au> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-rw-r--r--drivers/video/sunxi/hdmi/hdmi_edid.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/video/sunxi/hdmi/hdmi_edid.c b/drivers/video/sunxi/hdmi/hdmi_edid.c
index 3479d8ab106c..432d0c762684 100644
--- a/drivers/video/sunxi/hdmi/hdmi_edid.c
+++ b/drivers/video/sunxi/hdmi/hdmi_edid.c
@@ -198,10 +198,15 @@ static __s32
EDID_Version_Check(__u8 *pbuf)
{
pr_info("EDID version: %d.%d\n", pbuf[0x12], pbuf[0x13]);
- if ((pbuf[0x12] != 0x01) || (pbuf[0x13] != 0x03)) {
+ if (pbuf[0x12] != 0x01) {
pr_info("Unsupport EDID format,EDID parsing exit\n");
return -1;
}
+ if (pbuf[0x13] < 3 && !(pbuf[0x18] & 0x02)) {
+ pr_info("EDID revision < 3 and preferred timing feature bit "
+ "not set, ignoring EDID info\n");
+ return -1;
+ }
return 0;
}