| author | Lei Yang <lei.yang@amlogic.com> | 2019-05-28 03:36:49 (GMT) |
|---|---|---|
| committer | Lei Yang <lei.yang@amlogic.com> | 2019-05-28 04:20:22 (GMT) |
| commit | b559122872193fbc843bf4b1845457fef11493b7 (patch) | |
| tree | dc6cd6a338d719db10f4f49c1d200cf1c8ccecb8 | |
| parent | e226781fc22bb432f72e7ebfcdba3fc44ec73dac (diff) | |
| download | common-b559122872193fbc843bf4b1845457fef11493b7.zip common-b559122872193fbc843bf4b1845457fef11493b7.tar.gz common-b559122872193fbc843bf4b1845457fef11493b7.tar.bz2 | |
hdmirx: disable audio combining fuction for non-repeater mode
PD#OTT-4141
Problem:
there is no sound output when DVD player selected DTS mode
Solution:
disable audio combining fuction for non-repeater mode
Verify:
962E
Change-Id: If3b73d10c41ba1f870d7899d86dc1231ca2c2469
Signed-off-by: Lei Yang <lei.yang@amlogic.com>
| -rw-r--r-- | drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h | 2 | ||||
| -rw-r--r-- | drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c | 10 | ||||
| -rw-r--r-- | drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_repeater.c | 4 |
3 files changed, 8 insertions, 8 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 1be9285..02b4695 100644 --- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h +++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h @@ -46,7 +46,7 @@ * * */ -#define RX_VER2 "ver.2019/03/22" +#define RX_VER2 "ver.2019/05/28" /*print type*/ #define LOG_EN 0x01 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 a7774e5..3574e67 100644 --- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c +++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c @@ -814,7 +814,7 @@ void rx_edid_update_audio_info(unsigned char *p_edid, } unsigned int rx_edid_cal_phy_addr( - u_int brepeat, + bool brepeat, u_int up_addr, u_int portmap, u_char *pedid, @@ -921,7 +921,7 @@ bool is_ddc_idle(unsigned char port_id) void rx_edid_fill_to_register( u_char *pedid, - u_int brepeat, + bool brepeat, u_int *pphy_addr, u_char *pchecksum) { @@ -1158,7 +1158,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 = true; + bool brepeat = hdmirx_repeat_support(); u_char *pedid_data; u_int sts; u_int phy_addr_offset; @@ -1183,7 +1183,7 @@ unsigned int hdmi_rx_top_edid_update(void) rx_edid_update_atmos(pedid_data); /* caculate physical address and checksum */ - sts = rx_edid_cal_phy_addr(brepeat, + sts = rx_edid_cal_phy_addr(true, up_phy_addr, port_map, pedid_data, &phy_addr_offset, phy_addr); @@ -1193,7 +1193,7 @@ unsigned int hdmi_rx_top_edid_update(void) } /* write edid to edid register */ - rx_edid_fill_to_register(pedid_data, brepeat, + rx_edid_fill_to_register(pedid_data, true, phy_addr, checksum); if (sts) { /* update physical and checksum */ diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_repeater.c b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_repeater.c index 88a2c6c..f0b8b9e 100644 --- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_repeater.c +++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_repeater.c @@ -114,7 +114,7 @@ void rx_check_repeat(void) rx.hdcp.dev_exceed = 0; rx.hdcp.cascade_exceed = 0; memset(&receive_hdcp, 0, sizeof(receive_hdcp)); - tx_hpd_event = true; + tx_hpd_event = 1; memset(&receive_edid, 0, sizeof(receive_edid)); rx_send_hpd_pulse(); } @@ -123,7 +123,7 @@ void rx_check_repeat(void) /*check downstream plug when new plug occur*/ /*check receive change*/ hdmi_rx_top_edid_update(); - tx_hpd_event = false; + tx_hpd_event = 0; rx_send_hpd_pulse(); } if (repeat_plug) { |