From: Zheng Yang Date: Fri, 14 Aug 2015 05:57:29 +0000 (+0800) Subject: hdmi:fix edid parse 4096x2160@24Hz error. X-Git-Tag: firefly_0821_release~3849 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4107ab806ebc51cc44a5a473eb433ab0f66dba6e;p=firefly-linux-kernel-4.4.55.git hdmi:fix edid parse 4096x2160@24Hz error. Signed-off-by: Zheng Yang --- diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmi-edid.c b/drivers/video/rockchip/hdmi/rockchip-hdmi-edid.c index 4673082416cd..610937e703ed 100644 --- a/drivers/video/rockchip/hdmi/rockchip-hdmi-edid.c +++ b/drivers/video/rockchip/hdmi/rockchip-hdmi-edid.c @@ -186,8 +186,11 @@ static int hdmi_edid_parse_3dinfo(unsigned char *buf, struct list_head *head) if (buf[1] & 0xe0) { len = (buf[1] & 0xe0) >> 5; for (i = 0; i < len; i++) { - if (buf[offset]) - hdmi_add_vic((96 - buf[offset]), head); + if (buf[offset]) { + vic_2d = (buf[offset] == 4) ? + 98 : (96 - buf[offset]); + hdmi_add_vic(vic_2d, head); + } offset++; } }