1 files changed, 11 insertions, 2 deletions

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 06a78b2ab690..f503aa495b2f 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -571,11 +571,20 @@ void omapdss_hdmi_display_set_timing(struct omap_dss_device *dssdev)
         struct hdmi_cm cm;
 
         hdmi.custom_set = 1;
+
         cm = hdmi_get_code(&dssdev->panel.timings);
         hdmi.code = cm.code;
         hdmi.mode = cm.mode;
-        omapdss_hdmi_display_enable(dssdev);
-        hdmi.custom_set = 0;
+
+        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
+                int r;
+
+                hdmi_power_off(dssdev);
+
+                r = hdmi_power_on(dssdev);
+                if (r)
+                        DSSERR("failed to power on device\n");
+        }
 }
 
 int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev)