3 files changed, 39 insertions, 28 deletions

diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 3682e3f78426..ea39a994d1fd 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -484,7 +484,8 @@ static inline unsigned long hdmi_get_pixel_clock(void)
 #endif
 int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev);
 void omapdss_hdmi_display_disable(struct omap_dss_device *dssdev);
-void omapdss_hdmi_display_set_timing(struct omap_dss_device *dssdev);
+void omapdss_hdmi_display_set_timing(struct omap_dss_device *dssdev,
+                struct omap_video_timings *timings);
 int omapdss_hdmi_display_check_timing(struct omap_dss_device *dssdev,
                                         struct omap_video_timings *timings);
 int omapdss_hdmi_read_edid(u8 *buf, int len);
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index a65dafaa0d72..964a19500c0e 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -459,7 +459,6 @@ static void hdmi_compute_pll(struct omap_dss_device *dssdev, int phy,
 static int hdmi_power_on(struct omap_dss_device *dssdev)
 {
         int r;
-        const struct hdmi_config *timing;
         struct omap_video_timings *p;
         unsigned long phy;
 
@@ -469,22 +468,10 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
 
         dss_mgr_disable(dssdev->manager);
 
-        p = &dssdev->panel.timings;
+        p = &hdmi.ip_data.cfg.timings;
 
-        DSSDBG("hdmi_power_on x_res= %d y_res = %d\n",
-                dssdev->panel.timings.x_res,
-                dssdev->panel.timings.y_res);
+        DSSDBG("hdmi_power_on x_res= %d y_res = %d\n", p->x_res, p->y_res);
 
-        timing = hdmi_get_timings();
-        if (timing == NULL) {
-                /* HDMI code 4 corresponds to 640 * 480 VGA */
-                hdmi.ip_data.cfg.cm.code = 4;
-                /* DVI mode 1 corresponds to HDMI 0 to DVI */
-                hdmi.ip_data.cfg.cm.mode = HDMI_DVI;
-                hdmi.ip_data.cfg = vesa_timings[0];
-        } else {
-                hdmi.ip_data.cfg = *timing;
-        }
         phy = p->pixel_clock;
 
         hdmi_compute_pll(dssdev, phy, &hdmi.ip_data.pll_data);
@@ -521,7 +508,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
         dispc_enable_gamma_table(0);
 
         /* tv size */
-        dss_mgr_set_timings(dssdev->manager, &dssdev->panel.timings);
+        dss_mgr_set_timings(dssdev->manager, p);
 
         r = hdmi.ip_data.ops->video_enable(&hdmi.ip_data);
         if (r)
@@ -568,13 +555,18 @@ int omapdss_hdmi_display_check_timing(struct omap_dss_device *dssdev,
 
 }
 
-void omapdss_hdmi_display_set_timing(struct omap_dss_device *dssdev)
+void omapdss_hdmi_display_set_timing(struct omap_dss_device *dssdev,
+                struct omap_video_timings *timings)
 {
         struct hdmi_cm cm;
+        const struct hdmi_config *t;
 
-        cm = hdmi_get_code(&dssdev->panel.timings);
-        hdmi.ip_data.cfg.cm.code = cm.code;
-        hdmi.ip_data.cfg.cm.mode = cm.mode;
+        cm = hdmi_get_code(timings);
+        hdmi.ip_data.cfg.cm = cm;
+
+        t = hdmi_get_timings();
+        if (t != NULL)
+                hdmi.ip_data.cfg = *t;
 
         if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
                 int r;
@@ -585,7 +577,7 @@ void omapdss_hdmi_display_set_timing(struct omap_dss_device *dssdev)
                 if (r)
                         DSSERR("failed to power on device\n");
         } else {
-                dss_mgr_set_timings(dssdev->manager, &dssdev->panel.timings);
+                dss_mgr_set_timings(dssdev->manager, &t->timings);
         }
 }
 
@@ -930,6 +922,7 @@ static int __init omapdss_hdmihw_probe(struct platform_device *pdev)
         hdmi.ip_data.core_av_offset = HDMI_CORE_AV;
         hdmi.ip_data.pll_offset = HDMI_PLLCTRL;
         hdmi.ip_data.phy_offset = HDMI_PHY;
+
         mutex_init(&hdmi.ip_data.lock);
 
         hdmi_panel_init();
diff --git a/drivers/video/omap2/dss/hdmi_panel.c b/drivers/video/omap2/dss/hdmi_panel.c
index e10844faadf9..2feb2cdfb60f 100644
--- a/drivers/video/omap2/dss/hdmi_panel.c
+++ b/drivers/video/omap2/dss/hdmi_panel.c
@@ -41,17 +41,32 @@ static struct {
 
 static int hdmi_panel_probe(struct omap_dss_device *dssdev)
 {
+        /* Initialize default timings to VGA in DVI mode */
+        const struct omap_video_timings default_timings = {
+                .x_res          = 640,
+                .y_res          = 480,
+                .pixel_clock    = 25175,
+                .hsw            = 96,
+                .hfp            = 16,
+                .hbp            = 48,
+                .vsw            = 2,
+                .vfp            = 11,
+                .vbp            = 31,
+
+                .vsync_level    = OMAPDSS_SIG_ACTIVE_LOW,
+                .hsync_level    = OMAPDSS_SIG_ACTIVE_LOW,
+
+                .interlace      = false,
+        };
+
         DSSDBG("ENTER hdmi_panel_probe\n");
 
-        dssdev->panel.timings = (struct omap_video_timings)
-                        { 640, 480, 25175, 96, 16, 48, 2, 11, 31,
-                                OMAPDSS_SIG_ACTIVE_LOW, OMAPDSS_SIG_ACTIVE_LOW,
-                                false,
-                        };
+        dssdev->panel.timings = default_timings;
 
         DSSDBG("hdmi_panel_probe x_res= %d y_res = %d\n",
                 dssdev->panel.timings.x_res,
                 dssdev->panel.timings.y_res);
+
         return 0;
 }
 
@@ -228,6 +243,8 @@ static int hdmi_panel_enable(struct omap_dss_device *dssdev)
                 goto err;
         }
 
+        omapdss_hdmi_display_set_timing(dssdev, &dssdev->panel.timings);
+
         r = omapdss_hdmi_display_enable(dssdev);
         if (r) {
                 DSSERR("failed to power on\n");
@@ -336,8 +353,8 @@ static void hdmi_set_timings(struct omap_dss_device *dssdev,
          */
         hdmi_panel_audio_disable(dssdev);
 
+        omapdss_hdmi_display_set_timing(dssdev, timings);
         dssdev->panel.timings = *timings;
-        omapdss_hdmi_display_set_timing(dssdev);
 
         mutex_unlock(&hdmi.lock);
 }