TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

display: slimport: fix audio channel count switch

Browse Source 
Bug: 11119819.
Signed-off-by: Eric Laurent <elaurent@google.com>
This commit is contained in:
Eric Laurent
2013-10-11 10:12:16 -07:00
committed by Iliyan Malchev
parent bacaa60291
commit c53b8257db
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/misc/slimport_anx7808/slimport_tx_drv.c
View File

@@ -1187,7 +1187,6 @@ static void sp_tx_enable_audio_output(unchar benable)
sp_read_reg(TX_P0, SP_TX_AUD_CTRL, &c); sp_read_reg(TX_P0, SP_TX_AUD_CTRL, &c);
if (benable) { if (benable) {
sp_read_reg(TX_P0, SP_TX_AUD_CTRL, &c);
if (c&AUD_EN) { if (c&AUD_EN) {
c &= ~AUD_EN; c &= ~AUD_EN;
sp_write_reg(TX_P0, SP_TX_AUD_CTRL, c); sp_write_reg(TX_P0, SP_TX_AUD_CTRL, c);
@@ -3189,7 +3188,7 @@ static void hdmi_rx_restart_audio_chk(void)
SP_DEV_DBG("WAIT_AUDIO: hdmi_rx_restart_audio_chk.\n"); SP_DEV_DBG("WAIT_AUDIO: hdmi_rx_restart_audio_chk.\n");
g_cts_got = 0; g_cts_got = 0;
g_audio_got = 0; g_audio_got = 0;
if (hdmi_system_state == HDMI_AUDIO_CONFIG) if (hdmi_system_state > HDMI_AUDIO_CONFIG)
hdmi_rx_set_sys_state(HDMI_AUDIO_CONFIG); hdmi_rx_set_sys_state(HDMI_AUDIO_CONFIG);
} }
@@ -3670,7 +3669,7 @@ static void hdmi_rx_hdmi_dvi_int(void)
SP_DEV_NOTICE("hdmi_rx_hdmi_dvi_int: HDMI MODE."); SP_DEV_NOTICE("hdmi_rx_hdmi_dvi_int: HDMI MODE.");
if (hdmi_system_state == HDMI_PLAYBACK) if (hdmi_system_state == HDMI_PLAYBACK)
hdmi_rx_set_sys_state(HDMI_AUDIO_CONFIG); hdmi_rx_restart_audio_chk();
} else { } else {
hdmi_rx_unmute_audio(); hdmi_rx_unmute_audio();
} }