2 files changed, 8 insertions, 0 deletions

diff --git a/drivers/video/fbdev/omap2/dss/hdmi.h b/drivers/video/fbdev/omap2/dss/hdmi.h
index dde1989901a8..e4a32fe77b02 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi.h
+++ b/drivers/video/fbdev/omap2/dss/hdmi.h
@@ -357,6 +357,7 @@ struct omap_hdmi {
 
         struct platform_device *audio_pdev;
         void (*audio_abort_cb)(struct device *dev);
+        int wp_idlemode;
 };
 
 #endif
diff --git a/drivers/video/fbdev/omap2/dss/hdmi5.c b/drivers/video/fbdev/omap2/dss/hdmi5.c
index 84736667e528..cbfb282f35cf 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi5.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi5.c
@@ -607,6 +607,10 @@ static int hdmi_audio_start(struct device *dev)
         WARN_ON(!hdmi_mode_has_audio(&hd->cfg));
         WARN_ON(!hd->display_enabled);
 
+        /* No-idle while playing audio, store the old value */
+        hd->wp_idlemode = REG_GET(hdmi.wp.base, HDMI_WP_SYSCONFIG, 3, 2);
+        REG_FLD_MOD(hdmi.wp.base, HDMI_WP_SYSCONFIG, 1, 3, 2);
+
         hdmi_wp_audio_enable(&hd->wp, true);
         hdmi_wp_audio_core_req_enable(&hd->wp, true);
 
@@ -622,6 +626,9 @@ static void hdmi_audio_stop(struct device *dev)
 
         hdmi_wp_audio_core_req_enable(&hd->wp, false);
         hdmi_wp_audio_enable(&hd->wp, false);
+
+        /* Playback stopped, restore original idlemode */
+        REG_FLD_MOD(hdmi.wp.base, HDMI_WP_SYSCONFIG, hd->wp_idlemode, 3, 2);
 }
 
 static int hdmi_audio_config(struct device *dev,