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

hdmitx: fix VSDB parsing error

Browse Source 
PD#160588: hdmitx: fix VSDB parsing error

Fix EDID VSDB parsing error.

Change-Id: Idbc7e4c801f032583004ee7d4e3b9e0decf44074
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
This commit is contained in:
Kaifu Hu
2018-02-07 20:05:07 +08:00
committed by Jianxin Pan
parent b77ecce99e
commit 86f6d80fef
2 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_edid.c
View File

@@ -1386,24 +1386,23 @@ static int hdmitx_edid_block_parse(struct hdmitx_dev *hdmitx_device,
offset++;
if ((BlockBuf[offset] == 0x03) &&
(BlockBuf[offset+1] == 0x0c) &&
(BlockBuf[offset+2] == 0x00))
(BlockBuf[offset+2] == 0x00)) {
pRXCap->IEEEOUI = 0x000c03;
else
goto case_hf;
pRXCap->ColorDeepSupport =
(unsigned long)BlockBuf[offset+5];
pRXCap->Max_TMDS_Clock1 =
(unsigned long)BlockBuf[offset+6];
if (count > 7) {
tmp = BlockBuf[offset+7];
idx = offset + 8;
if (tmp & (1<<6))
idx += 2;
if (tmp & (1<<7))
idx += 2;
if (tmp & (1<<5)) {
idx += 1;
/* valid 4k */
pRXCap->ColorDeepSupport =
(count > 5) ? BlockBuf[offset+5] : 0;
pRXCap->Max_TMDS_Clock1 =
(count > 6) ? BlockBuf[offset+6] : 0;
if (count > 7) {
tmp = BlockBuf[offset+7];
idx = offset + 8;
if (tmp & (1<<6))
idx += 2;
if (tmp & (1<<7))
idx += 2;
if (tmp & (1<<5)) {
idx += 1;
/* valid 4k */
if (BlockBuf[idx] & 0xe0) {
hdmitx_edid_4k2k_parse(
pRXCap,
@@ -1417,24 +1416,23 @@ static int hdmitx_edid_block_parse(struct hdmitx_dev *hdmitx_device,
&BlockBuf[offset+7],
count - 7);
}
}
}
}
goto case_next;
case_hf:
if ((BlockBuf[offset] == 0xd8) &&
} else if ((BlockBuf[offset] == 0xd8) &&
(BlockBuf[offset+1] == 0x5d) &&
(BlockBuf[offset+2] == 0xc4))
(BlockBuf[offset+2] == 0xc4)) {
pRXCap->HF_IEEEOUI = 0xd85dc4;
pRXCap->Max_TMDS_Clock2 = BlockBuf[offset+4];
pRXCap->scdc_present =
!!(BlockBuf[offset+5] & (1 << 7));
pRXCap->scdc_rr_capable =
!!(BlockBuf[offset+5] & (1 << 6));
pRXCap->lte_340mcsc_scramble =
!!(BlockBuf[offset+5] & (1 << 3));
set_vsdb_dc_420_cap(&hdmitx_device->RXCap,
&BlockBuf[offset]);
case_next:
pRXCap->Max_TMDS_Clock2 = BlockBuf[offset+4];
pRXCap->scdc_present =
!!(BlockBuf[offset+5] & (1 << 7));
pRXCap->scdc_rr_capable =
!!(BlockBuf[offset+5] & (1 << 6));
pRXCap->lte_340mcsc_scramble =
!!(BlockBuf[offset+5] & (1 << 3));
set_vsdb_dc_420_cap(&hdmitx_device->RXCap,
&BlockBuf[offset]);
}
offset += count; /* ignore the remaind. */
break;

4
include/linux/amlogic/media/vout/hdmi_tx/hdmi_tx_module.h
View File

@@ -79,7 +79,7 @@ struct rx_cap {
unsigned char RxSpeakerAllocation;
/*vendor*/
unsigned int IEEEOUI;
unsigned int Max_TMDS_Clock1; /* HDMI1.4b TMDS_CLK */
unsigned char Max_TMDS_Clock1; /* HDMI1.4b TMDS_CLK */
unsigned int HF_IEEEOUI; /* For HDMI Forum */
unsigned int Max_TMDS_Clock2; /* HDMI2.0 TMDS_CLK */
/* CEA861-F, Table 56, Colorimetry Data Block */
@@ -112,7 +112,7 @@ struct rx_cap {
unsigned char physcial_height;
unsigned char edid_version;
unsigned char edid_revision;
unsigned int ColorDeepSupport;
unsigned char ColorDeepSupport;
unsigned int Video_Latency;
unsigned int Audio_Latency;
unsigned int Interlaced_Video_Latency;