From 0a22008d1feceb090f94e6d8a6c9838971758c7d Mon Sep 17 00:00:00 2001 From: yicheng shen Date: Tue, 20 Mar 2018 15:16:03 +0800 Subject: [PATCH] hdmirx: enable edid overlay function PD#161284: hdmirx: enable edid overload function Change-Id: If8d88c0351d9d79b9fe9cf5737d8909fc12480fb Signed-off-by: yicheng shen --- drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h | 2 +- drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h index 2cfa7de..7e9bab6 100644 --- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h +++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h @@ -41,7 +41,7 @@ * * */ -#define RX_VER1 "ver.2018/01/01" +#define RX_VER1 "ver.2018/03/20" diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c index de13933..e49766a 100644 --- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c +++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c @@ -507,8 +507,7 @@ unsigned int rx_edid_cal_phy_addr( /*find phy_addr_offset*/ if (pedid[i] == 0x03) { if ((pedid[i+1] == 0x0c) && - (pedid[i+2] == 0x00) && - (pedid[i+4]) == 0x0c) { + (pedid[i+2] == 0x00)) { if (brepeat) pedid[i+3] = 0x00; else @@ -604,7 +603,6 @@ void rx_edid_fill_to_register( } } -#if 0 void rx_edid_update_overlay( u_int phy_addr_offset, u_int *pphy_addr, @@ -668,7 +666,6 @@ void rx_edid_update_overlay( //i, pphy_addr[i], pchecksum[i]); //} } -#endif /* @func: seek dd+ atmos bit * @param:get audio type info by cec message: @@ -767,7 +764,7 @@ unsigned char rx_edid_update_atmos(unsigned char *p_edid) unsigned int hdmi_rx_top_edid_update(void) { int edid_index = rx_get_edid_index(); - bool brepeat = hdmirx_repeat_support(); + bool brepeat = true; u_char *pedid_data; u_int sts; u_int phy_addr_offset; @@ -802,10 +799,10 @@ unsigned int hdmi_rx_top_edid_update(void) /* write edid to edid register */ rx_edid_fill_to_register(pedid_data, brepeat, phy_addr, checksum); - //if (sts) { + if (sts) { /* update physical and checksum */ - //rx_edid_update_overlay(phy_addr_offset, phy_addr, checksum); - //} + rx_edid_update_overlay(phy_addr_offset, phy_addr, checksum); + } return true; } -- 2.7.4