Revert "tegra: hdmi: start hdmi audio after hdmi_enable"

This reverts commit 9015c65e4a012ca72b319eb8e910e2e826839640
as it is suspected to cause audio playback issue on Foster board.

Bug 200021201

Change-Id: Id2dc31925faac68c5af2c7b48066f5d575e554fb
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-on: http://git-master/r/438040
Reviewed-by: Shridhar Rasal <srasal@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Mitch Luban <mluban@nvidia.com>
Tested-by: Mitch Luban <mluban@nvidia.com>

diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c
index 621cbfe385056cedfc53848e966fa685a068483a..3ca0c8b98bed193b6cf3d6e8836e7ee07fc827ef 100644 (file)
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@ -1958,9 +1958,6 @@ static void tegra_dc_hdmi_enable(struct tegra_dc *dc)
        const struct tmds_config *tmds_ptr;
        size_t tmds_len;
        bool edid_read;
-#ifdef CONFIG_SWITCH
-       int state;
-#endif
 
        /* enable power, clocks, resets, etc. */
 
@@ -2187,13 +2184,6 @@ static void tegra_dc_hdmi_enable(struct tegra_dc *dc)
         */
        tegra_nvhdcp_set_plug(hdmi->nvhdcp, tegra_dc_hpd(dc));
        tegra_dc_io_end(dc);
-
-#ifdef CONFIG_SWITCH
-       state = tegra_edid_audio_supported(hdmi->edid) ? 1 : 0;
-       switch_set_state(&hdmi->audio_switch, state);
-       pr_info("%s: audio_switch %d\n", __func__, state);
-#endif
-
 }
 
 static void tegra_dc_hdmi_disable(struct tegra_dc *dc)

diff --git a/drivers/video/tegra/dc/hdmi_state_machine.c b/drivers/video/tegra/dc/hdmi_state_machine.c
index c6d1d811dde3327386552fbd27a24c8019d5feb5..7fa0c046ebe7ad06d5322226f38e7d5077b125cd 100644 (file)
--- a/drivers/video/tegra/dc/hdmi_state_machine.c
+++ b/drivers/video/tegra/dc/hdmi_state_machine.c
@@ -228,6 +228,9 @@ static void handle_check_plug_state_l(struct tegra_dc_hdmi_data *hdmi)
 static void handle_check_edid_l(struct tegra_dc_hdmi_data *hdmi)
 {
        struct fb_monspecs specs;
+#ifdef CONFIG_SWITCH
+       int state;
+#endif
 
        memset(&specs, 0, sizeof(specs));
 #ifdef CONFIG_FRAMEBUFFER_CONSOLE
@@ -282,6 +285,9 @@ static void handle_check_edid_l(struct tegra_dc_hdmi_data *hdmi)
                tegra_dc_hdmi_mode_filter);
 #endif
 #ifdef CONFIG_SWITCH
+       state = tegra_edid_audio_supported(hdmi->edid) ? 1 : 0;
+       switch_set_state(&hdmi->audio_switch, state);
+       pr_info("%s: audio_switch %d\n", __func__, state);
        switch_set_state(&hdmi->hpd_switch, 1);
        pr_info("Display connected, hpd_switch 1\n");
 #endif