8 files changed, 37 insertions, 31 deletions

diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index ac9bf750e77..d6a4b31fa0b 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -992,7 +992,7 @@ static void dispc_mgr_set_lcd_size(enum omap_channel channel, u16 width,
         dispc_write_reg(DISPC_SIZE_MGR(channel), val);
 }
 
-void dispc_set_digit_size(u16 width, u16 height)
+static void dispc_mgr_set_digit_size(u16 width, u16 height)
 {
         u32 val;
         BUG_ON((width > (1 << 11)) || (height > (1 << 11)));
@@ -2341,37 +2341,42 @@ static void _dispc_mgr_set_lcd_timings(enum omap_channel channel, int hsw,
 }
 
 /* change name to mode? */
-void dispc_mgr_set_lcd_timings(enum omap_channel channel,
+void dispc_mgr_set_timings(enum omap_channel channel,
                 struct omap_video_timings *timings)
 {
         unsigned xtot, ytot;
         unsigned long ht, vt;
 
-        if (!_dispc_lcd_timings_ok(timings->hsw, timings->hfp,
-                                timings->hbp, timings->vsw,
-                                timings->vfp, timings->vbp))
-                BUG();
+        DSSDBG("channel %d xres %u yres %u\n", channel, timings->x_res,
+                        timings->y_res);
+
+        if (dispc_mgr_is_lcd(channel)) {
+                if (!dispc_lcd_timings_ok(timings))
+                        BUG();
 
-        _dispc_mgr_set_lcd_timings(channel, timings->hsw, timings->hfp,
-                        timings->hbp, timings->vsw, timings->vfp,
-                        timings->vbp);
+                _dispc_mgr_set_lcd_timings(channel, timings->hsw, timings->hfp,
+                                timings->hbp, timings->vsw, timings->vfp,
+                                timings->vbp);
 
-        dispc_mgr_set_lcd_size(channel, timings->x_res, timings->y_res);
+                dispc_mgr_set_lcd_size(channel, timings->x_res, timings->y_res);
 
-        xtot = timings->x_res + timings->hfp + timings->hsw + timings->hbp;
-        ytot = timings->y_res + timings->vfp + timings->vsw + timings->vbp;
+                xtot = timings->x_res + timings->hfp + timings->hsw +
+                                timings->hbp;
+                ytot = timings->y_res + timings->vfp + timings->vsw +
+                                timings->vbp;
 
-        ht = (timings->pixel_clock * 1000) / xtot;
-        vt = (timings->pixel_clock * 1000) / xtot / ytot;
+                ht = (timings->pixel_clock * 1000) / xtot;
+                vt = (timings->pixel_clock * 1000) / xtot / ytot;
 
-        DSSDBG("channel %d xres %u yres %u\n", channel, timings->x_res,
-                        timings->y_res);
-        DSSDBG("pck %u\n", timings->pixel_clock);
-        DSSDBG("hsw %d hfp %d hbp %d vsw %d vfp %d vbp %d\n",
+                DSSDBG("pck %u\n", timings->pixel_clock);
+                DSSDBG("hsw %d hfp %d hbp %d vsw %d vfp %d vbp %d\n",
                         timings->hsw, timings->hfp, timings->hbp,
                         timings->vsw, timings->vfp, timings->vbp);
 
-        DSSDBG("hsync %luHz, vsync %luHz\n", ht, vt);
+                DSSDBG("hsync %luHz, vsync %luHz\n", ht, vt);
+        } else {
+                dispc_mgr_set_digit_size(timings->x_res, timings->y_res);
+        }
 }
 
 static void dispc_mgr_set_lcd_divisor(enum omap_channel channel, u16 lck_div,
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index faaf305fda2..7dd7f9d2590 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -156,7 +156,7 @@ static int dpi_set_mode(struct omap_dss_device *dssdev)
                 t->pixel_clock = pck;
         }
 
-        dispc_mgr_set_lcd_timings(dssdev->manager->id, t);
+        dispc_mgr_set_timings(dssdev->manager->id, t);
 
         return 0;
 }
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 0d2c53f4271..b6cf03cc922 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -4219,12 +4219,12 @@ static int dsi_display_init_dispc(struct omap_dss_device *dssdev)
                 dispc_mgr_enable_stallmode(dssdev->manager->id, true);
                 dispc_mgr_enable_fifohandcheck(dssdev->manager->id, 1);
 
-                dispc_mgr_set_lcd_timings(dssdev->manager->id, &timings);
+                dispc_mgr_set_timings(dssdev->manager->id, &timings);
         } else {
                 dispc_mgr_enable_stallmode(dssdev->manager->id, false);
                 dispc_mgr_enable_fifohandcheck(dssdev->manager->id, 0);
 
-                dispc_mgr_set_lcd_timings(dssdev->manager->id,
+                dispc_mgr_set_timings(dssdev->manager->id,
                         &dssdev->panel.timings);
         }
 
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index e8dea7485f7..da91822b596 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -407,7 +407,6 @@ void dispc_disable_sidle(void);
 void dispc_lcd_enable_signal_polarity(bool act_high);
 void dispc_lcd_enable_signal(bool enable);
 void dispc_pck_free_enable(bool enable);
-void dispc_set_digit_size(u16 width, u16 height);
 void dispc_enable_fifomerge(bool enable);
 void dispc_enable_gamma_table(bool enable);
 void dispc_set_loadmode(enum omap_dss_load_mode mode);
@@ -442,7 +441,7 @@ void dispc_mgr_enable_stallmode(enum omap_channel channel, bool enable);
 void dispc_mgr_set_tft_data_lines(enum omap_channel channel, u8 data_lines);
 void dispc_mgr_set_lcd_display_type(enum omap_channel channel,
                 enum omap_lcd_display_type type);
-void dispc_mgr_set_lcd_timings(enum omap_channel channel,
+void dispc_mgr_set_timings(enum omap_channel channel,
                 struct omap_video_timings *timings);
 void dispc_mgr_set_pol_freq(enum omap_channel channel,
                 enum omap_panel_config config, u8 acbi, u8 acb);
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index c4b4f6950a9..56f6e9ce126 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -376,8 +376,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
         dispc_enable_gamma_table(0);
 
         /* tv size */
-        dispc_set_digit_size(dssdev->panel.timings.x_res,
-                        dssdev->panel.timings.y_res);
+        dispc_mgr_set_timings(dssdev->manager->id, &dssdev->panel.timings);
 
         hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 1);
 
diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index 97b6c4a2bce..a81ffcbfa68 100644
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -320,7 +320,7 @@ static void rfbi_transfer_area(struct omap_dss_device *dssdev, u16 width,
 
         DSSDBG("rfbi_transfer_area %dx%d\n", width, height);
 
-        dispc_mgr_set_lcd_timings(dssdev->manager->id, &timings);
+        dispc_mgr_set_timings(dssdev->manager->id, &timings);
 
         dispc_mgr_enable(dssdev->manager->id, true);
 
@@ -804,7 +804,7 @@ int omap_rfbi_prepare_update(struct omap_dss_device *dssdev,
         if (*w == 0 || *h == 0)
                 return -EINVAL;
 
-        dispc_mgr_set_lcd_timings(dssdev->manager->id, &timings);
+        dispc_mgr_set_timings(dssdev->manager->id, &timings);
 
         return 0;
 }
diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
index 8266ca0d666..741b8341439 100644
--- a/drivers/video/omap2/dss/sdi.c
+++ b/drivers/video/omap2/dss/sdi.c
@@ -107,7 +107,7 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
         }
 
 
-        dispc_mgr_set_lcd_timings(dssdev->manager->id, t);
+        dispc_mgr_set_timings(dssdev->manager->id, t);
 
         r = dss_set_clock_div(&dss_cinfo);
         if (r)
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 13a20da8ea9..30bbb63421b 100644
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -421,6 +421,7 @@ static int venc_power_on(struct omap_dss_device *dssdev)
 {
         u32 l;
         int r;
+        struct omap_video_timings timings;
 
         venc_reset();
         venc_write_config(venc_timings_to_config(&dssdev->panel.timings));
@@ -440,8 +441,10 @@ static int venc_power_on(struct omap_dss_device *dssdev)
 
         venc_write_reg(VENC_OUTPUT_CONTROL, l);
 
-        dispc_set_digit_size(dssdev->panel.timings.x_res,
-                        dssdev->panel.timings.y_res/2);
+        timings = dssdev->panel.timings;
+        timings.y_res /= 2;
+
+        dispc_mgr_set_timings(dssdev->manager->id, &timings);
 
         r = regulator_enable(venc.vdda_dac_reg);
         if (r)