summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorEmma Yan <eyan@nvidia.com>2013-09-03 19:38:59 +0800
committerRiham Haidar <rhaidar@nvidia.com>2013-09-08 00:34:20 -0700
commitb01bb6fd9f4475c9a430e180ed85db971558acf3 (patch)
tree2aa66e1aee6f16caa1655b49fb623a88c2abee15 /drivers/video
parentd32ed5a0085c678bc609905fca3426542d8db8d5 (diff)
video: fbmon: added HDMI_Video_Format condition checking
Bug 1357380 Change-Id: I4b10c31b1c5124539b648764cfae8b17b5764f0a Signed-off-by: Emma Yan <eyan@nvidia.com> Reviewed-on: http://git-master/r/269512 GVS: Gerrit_Virtual_Submit Reviewed-by: Jon Mayo <jmayo@nvidia.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbmon.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index e4d0ce2f2665..4ef31c10bee9 100644
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@ -1104,8 +1104,12 @@ void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs)
(edid[pos + 2] << 16);
if (ieee_reg == 0x000c03)
specs->misc |= FB_MISC_HDMI;
- fb_hvd_parse(edid, &hvd, pos + 3);
- hdmi_num = hvd.hdmi_vic_len;
+
+ /* HDMI_Video_Format @HDMI 1.4 ch8.2.3*/
+ if (edid[pos + 2] >> 5 != 0) {
+ fb_hvd_parse(edid, &hvd, pos + 3);
+ hdmi_num = hvd.hdmi_vic_len;
+ }
}
pos += len;