shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

hdmi:edid: improve edid check redundancy.

Browse Source 
If edid first block header check or checksum is error,
	but data[126] value is smaller than 4, we think it is
	accecptable, return suscess.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
This commit is contained in:
Zheng Yang
2015-06-05 14:20:31 +08:00
parent 801b12312d
commit 96ce23d239
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/video/rockchip/hdmi/rockchip-hdmi-edid.c
View File

@@ -83,11 +83,16 @@ static int hdmi_edid_parse_dtd(unsigned char *block, struct fb_videomode *mode)
int hdmi_edid_parse_base(unsigned char *buf,
int *extend_num, struct hdmi_edid *pedid)
{
int rc;
int rc = E_HDMI_EDID_SUCCESS;
if (buf == NULL || extend_num == NULL)
return E_HDMI_EDID_PARAM;
*extend_num = buf[0x7e];
#ifdef DEBUG
EDBG("[EDID] extend block num is %d\n", buf[0x7e]);
#endif
/* Check first 8 byte to ensure it is an edid base block. */
if (buf[0] != 0x00 ||
buf[1] != 0xFF ||
@@ -98,19 +103,16 @@ int hdmi_edid_parse_base(unsigned char *buf,
buf[6] != 0xFF ||
buf[7] != 0x00) {
pr_err("[EDID] check header error\n");
return E_HDMI_EDID_HEAD;
rc = E_HDMI_EDID_HEAD;
goto out;
}
*extend_num = buf[0x7e];
#ifdef DEBUG
EDBG("[EDID] extend block num is %d\n", buf[0x7e]);
#endif
/* Checksum */
rc = hdmi_edid_checksum(buf);
if (rc != E_HDMI_EDID_SUCCESS) {
pr_err("[EDID] base block checksum error\n");
return E_HDMI_EDID_CHECKSUM;
rc = E_HDMI_EDID_CHECKSUM;
goto out;
}
pedid->specs = kzalloc(sizeof(*pedid->specs), GFP_KERNEL);
@@ -119,7 +121,11 @@ int hdmi_edid_parse_base(unsigned char *buf,
fb_edid_to_monspecs(buf, pedid->specs);
return E_HDMI_EDID_SUCCESS;
out:
if (rc != E_HDMI_EDID_SUCCESS && *extend_num > 4)
return rc;
else
return E_HDMI_EDID_SUCCESS;
}
/* Parse CEA Short Video Descriptor */