mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDMI: remove limited conditions of calling switch_set_state.

Browse Source 
Application should read /sys/class/display/HDMI/audioinfo
      to detect sink device support audio or not.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
This commit is contained in:
Zheng Yang
2015-03-28 14:37:34 +08:00
parent f94118bca7
commit 48921e9feb
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/video/rockchip/hdmi/rockchip-hdmi-core.c
View File

@@ -217,10 +217,7 @@ static void hdmi_wq_insert(struct hdmi *hdmi)
/*hdmi->autoset = 0;*/
hdmi_wq_set_video(hdmi);
#ifdef CONFIG_SWITCH
if ((hdmi->edid.baseaudio_support &&
hdmi->edid.sink_hdmi) ||
rk_fb_get_display_policy() == DISPLAY_POLICY_BOX)
switch_set_state(&(hdmi->switchdev), 1);
switch_set_state(&(hdmi->switchdev), 1);
#endif
hdmi_wq_set_audio(hdmi);
hdmi_wq_set_output(hdmi, hdmi->mute);
@@ -242,10 +239,7 @@ static void hdmi_wq_remove(struct hdmi *hdmi)
if (hdmi->ops->remove)
hdmi->ops->remove(hdmi);
#ifdef CONFIG_SWITCH
if ((hdmi->edid.baseaudio_support &&
hdmi->edid.sink_hdmi) ||
rk_fb_get_display_policy() == DISPLAY_POLICY_BOX)
switch_set_state(&(hdmi->switchdev), 0);
switch_set_state(&(hdmi->switchdev), 0);
#endif
list_for_each_safe(pos, n, &hdmi->edid.modelist) {
list_del(pos);