HDMI: remove limited conditions of calling switch_set_state.
authorZheng Yang <zhengyang@rock-chips.com>
Sat, 28 Mar 2015 06:37:34 +0000 (14:37 +0800)
committerZheng Yang <zhengyang@rock-chips.com>
Sat, 28 Mar 2015 06:37:34 +0000 (14:37 +0800)
      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>
drivers/video/rockchip/hdmi/rockchip-hdmi-core.c

index 4fecefed0c655746d07bbc5ce6596933b26a6b05..290462d932670a42eb46067e391f3b96c953d6c5 100644 (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);