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

IEEEOUI to ieeeoui

Browse Source 
Change-Id: I266d8e8ea51f49c6c58c0fbeea5d77fab89a5e5a
This commit is contained in:
Luke Go
2020-06-23 12:24:23 +09:00
parent 0664273f62
commit dee0572dd6
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1502,7 +1502,7 @@ static int hdmitx_edid_block_parse(struct hdmitx_dev *hdmitx_device,
if ((BlockBuf[offset] == 0x03) &&
(BlockBuf[offset+1] == 0x0c) &&
(BlockBuf[offset+2] == 0x00)) {
pRXCap->IEEEOUI = 0x000c03;
pRXCap->ieeeoui = 0x000c03;
pRXCap->ColorDeepSupport =
(count > 5) ? BlockBuf[offset+5] : 0;
set_vsdb_dc_cap(pRXCap);
@@ -1549,7 +1549,7 @@ static int hdmitx_edid_block_parse(struct hdmitx_dev *hdmitx_device,
} else if ((BlockBuf[offset] == 0xd8) &&
(BlockBuf[offset+1] == 0x5d) &&
(BlockBuf[offset+2] == 0xc4)) {
pRXCap->HF_IEEEOUI = 0xd85dc4;
pRXCap->hf_ieeeoui = 0xd85dc4;
pRXCap->Max_TMDS_Clock2 = BlockBuf[offset+4];
pRXCap->scdc_present =
!!(BlockBuf[offset+5] & (1 << 7));
@@ -2100,18 +2100,18 @@ int hdmitx_edid_parse(struct hdmitx_dev *hdmitx_device)
pr_info(EDID "edid blk0 checksum:%d ext_flag:%d\n",
CheckSum, EDID_buf[0x7e]);
if ((CheckSum & 0xff) == 0)
hdmitx_device->RXCap.IEEEOUI = 0;
hdmitx_device->RXCap.ieeeoui = 0;
else
hdmitx_device->RXCap.IEEEOUI = 0x0c03;
hdmitx_device->RXCap.ieeeoui = 0x0c03;
if (zero_numbers > 120)
hdmitx_device->RXCap.IEEEOUI = 0x0c03;
hdmitx_device->RXCap.ieeeoui = 0x0c03;
return 0; /* do nothing. */
}
/* Note: some DVI monitor have more than 1 block */
if ((BlockCount == 1) && (EDID_buf[0x81] == 1)) {
hdmitx_device->RXCap.IEEEOUI = 0;
hdmitx_device->RXCap.ieeeoui = 0;
hdmitx_device->RXCap.VIC_count = 0x3;
hdmitx_device->RXCap.VIC[0] = HDMI_720x480p60_16x9;
hdmitx_device->RXCap.VIC[1] = HDMI_1280x720p60_16x9;
@@ -2170,14 +2170,14 @@ int hdmitx_edid_parse(struct hdmitx_dev *hdmitx_device)
}
if (hdmitx_edid_search_IEEEOUI(&EDID_buf[128])) {
pRXCap->IEEEOUI = 0x0c03;
pRXCap->ieeeoui = 0x0c03;
pr_info(EDID "find IEEEOUT\n");
} else {
pRXCap->IEEEOUI = 0x0;
pRXCap->ieeeoui = 0x0;
pr_info(EDID "not find IEEEOUT\n");
}
if ((pRXCap->IEEEOUI != 0x0c03) || (pRXCap->IEEEOUI == 0x0) ||
if ((pRXCap->ieeeoui != 0x0c03) || (pRXCap->ieeeoui == 0x0) ||
(pRXCap->VIC_count == 0))
hdmitx_edid_set_default_vic(hdmitx_device);
@@ -2185,15 +2185,15 @@ int hdmitx_edid_parse(struct hdmitx_dev *hdmitx_device)
/* valid EDID & no audio tag & no IEEEOUI */
if (edid_check_valid(&EDID_buf[0]) &&
!hdmitx_edid_search_IEEEOUI(&EDID_buf[128])) {
pRXCap->IEEEOUI = 0x0;
pRXCap->ieeeoui = 0x0;
pr_info(EDID "sink is DVI device\n");
} else
pRXCap->IEEEOUI = 0x0c03;
pRXCap->ieeeoui = 0x0c03;
if (edid_zero_data(EDID_buf))
pRXCap->IEEEOUI = 0x0c03;
pRXCap->ieeeoui = 0x0c03;
if ((!pRXCap->AUD_count) && (!pRXCap->IEEEOUI))
if ((!pRXCap->AUD_count) && (!pRXCap->ieeeoui))
hdmitx_edid_set_default_aud(hdmitx_device);
edid_save_checkvalue(EDID_buf, BlockCount+1);
@@ -2203,7 +2203,7 @@ int hdmitx_edid_parse(struct hdmitx_dev *hdmitx_device)
hdmitx_device->tmp_buf[i] = 0;
if (!hdmitx_edid_check_valid_blocks(&EDID_buf[0])) {
pRXCap->IEEEOUI = 0x0c03;
pRXCap->ieeeoui = 0x0c03;
pr_info(EDID "Invalid edid, consider RX as HDMI device\n");
}
/* update RX HDR information */
@@ -2409,7 +2409,7 @@ bool hdmitx_edid_check_valid_mode(struct hdmitx_dev *hdev,
pRXCap = &(hdev->RXCap);
/* DVI case, only 8bit */
if (pRXCap->IEEEOUI != 0x0c03) {
if (pRXCap->ieeeoui != 0x0c03) {
if (para->cd != COLORDEPTH_24B)
return 0;
}
@@ -2575,7 +2575,7 @@ void hdmitx_edid_clear(struct hdmitx_dev *hdmitx_device)
/* Note: in most cases, we think that rx is tv and the default
* IEEEOUI is HDMI Identifier
*/
pRXCap->IEEEOUI = 0x000c03;
pRXCap->ieeeoui = 0x000c03;
hdmitx_device->vic_count = 0;
hdmitx_device->hdmi_info.vsdb_phy_addr.a = 0;
@@ -2755,14 +2755,14 @@ int hdmitx_edid_dump(struct hdmitx_dev *hdmitx_device, char *buffer,
"Speaker Allocation: %x\n", pRXCap->RxSpeakerAllocation);
pos += snprintf(buffer+pos, buffer_len-pos,
"Vendor: 0x%x ( %s device)\n",
pRXCap->IEEEOUI, (pRXCap->IEEEOUI)?"HDMI":"DVI");
pRXCap->ieeeoui, (pRXCap->ieeeoui)?"HDMI":"DVI");
pos += snprintf(buffer+pos, buffer_len-pos,
"MaxTMDSClock1 %d MHz\n", pRXCap->Max_TMDS_Clock1 * 5);
if (pRXCap->HF_IEEEOUI) {
if (pRXCap->hf_ieeeoui) {
pos += snprintf(buffer+pos, buffer_len-pos, "Vendor2: 0x%x\n",
pRXCap->HF_IEEEOUI);
pRXCap->hf_ieeeoui);
pos += snprintf(buffer+pos, buffer_len-pos,
"MaxTMDSClock2 %d MHz\n", pRXCap->Max_TMDS_Clock2 * 5);
}

8
drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c
View File

@@ -557,9 +557,9 @@ static int set_disp_mode_auto(void)
hdev->HWOp.CntlConfig(hdev, CONF_HDMI_DVI_MODE,
DVI_MODE);
pr_info(SYS "change to DVI mode\n");
} else if (hdev->RXCap.IEEEOUI == 0) {
} else if (hdev->RXCap.ieeeoui == 0) {
#else
if (hdev->RXCap.IEEEOUI == 0) {
if (hdev->RXCap.ieeeoui == 0) {
#endif
/* DVI case judgement. In uboot, directly output HDMI
* mode
@@ -567,7 +567,7 @@ static int set_disp_mode_auto(void)
hdev->HWOp.CntlConfig(hdev, CONF_HDMI_DVI_MODE,
DVI_MODE);
pr_info(SYS "change to DVI mode\n");
} else if ((hdev->RXCap.IEEEOUI == 0xc03) &&
} else if ((hdev->RXCap.ieeeoui == 0xc03) &&
(hdev->HWOp.CntlConfig(hdev, CONF_GET_HDMI_DVI_MODE, 0)
== DVI_MODE)) {
hdev->HWOp.CntlConfig(hdev, CONF_HDMI_DVI_MODE,
@@ -3846,7 +3846,7 @@ static void hdmitx_hpd_plugin_handler(struct work_struct *work)
} else
#endif
{
if (hdev->RXCap.IEEEOUI != 0x000c03)
if (hdev->RXCap.ieeeoui != 0x000c03)
hdev->HWOp.CntlConfig(hdev,
CONF_HDMI_DVI_MODE, DVI_MODE);
else

2
drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_video.c
View File

@@ -766,7 +766,7 @@ static void hdmi_tx_construct_avi_packet(
*/
static int is_dvi_device(struct rx_cap *pRXCap)
{
if (pRXCap->IEEEOUI != 0x000c03)
if (pRXCap->ieeeoui != 0x000c03)
return 1;
else
return 0;