OMAP: DSS2: HDMI: make set_timing saner

[deliverable/linux.git] / drivers / video / omap2 / dss / hdmi.c

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 06a78b2ab690885352e9bd19cce746e9111e7dd3..f503aa495b2f5ddad59deef9208a7db8791d16b4 100644 (file)
--- 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)