OMAPDSS: VENC/DISPC: Delay dividing Y resolution for managers connected to VENC

DSS2 driver uses the timings in manager's private data to check the validity of
overlay and manager infos written by the user. For VENC interface, we divide the
Y resolution by half when writing to the DISPC_DIGIT_SIZE register as the
content is interlaced. However, the height of the manager/display with respect
to the content shown through VENC still remains the same.

The VENC driver divides the y_res parameter in omap_video_timings by half, and
then applies the configuration. This leads to manager's private data storing
the wrong Y resolution. Hence, overlay related checks fail.

Ensure that manager's private data stores the original timings, and the Y
resolution is halved only when we write to the DISPC register. This is a hack,
the proper solution would be to pass some sort of interlace parameter which
makes the call whether we should divide y_res or not.

Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

2 files changed, 17 insertions, 18 deletions

diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 9626b2c0c9e1..4749ac356469 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -2665,37 +2665,40 @@ void dispc_mgr_set_timings(enum omap_channel channel,
 {
         unsigned xtot, ytot;
         unsigned long ht, vt;
+        struct omap_video_timings t = *timings;
 
-        DSSDBG("channel %d xres %u yres %u\n", channel, timings->x_res,
-                        timings->y_res);
+        DSSDBG("channel %d xres %u yres %u\n", channel, t.x_res, t.y_res);
 
-        if (!dispc_mgr_timings_ok(channel, timings)) {
+        if (!dispc_mgr_timings_ok(channel, &t)) {
                 BUG();
                 return;
         }
 
         if (dispc_mgr_is_lcd(channel)) {
-                _dispc_mgr_set_lcd_timings(channel, timings->hsw, timings->hfp,
-                                timings->hbp, timings->vsw, timings->vfp,
-                                timings->vbp);
+                _dispc_mgr_set_lcd_timings(channel, t.hsw, t.hfp, t.hbp, t.vsw,
+                                t.vfp, t.vbp);
 
-                xtot = timings->x_res + timings->hfp + timings->hsw +
-                                timings->hbp;
-                ytot = timings->y_res + timings->vfp + timings->vsw +
-                                timings->vbp;
+                xtot = t.x_res + t.hfp + t.hsw + t.hbp;
+                ytot = t.y_res + t.vfp + t.vsw + t.vbp;
 
                 ht = (timings->pixel_clock * 1000) / xtot;
                 vt = (timings->pixel_clock * 1000) / xtot / ytot;
 
                 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);
+                        t.hsw, t.hfp, t.hbp, t.vsw, t.vfp, t.vbp);
 
                 DSSDBG("hsync %luHz, vsync %luHz\n", ht, vt);
+        } else {
+                enum dss_hdmi_venc_clk_source_select source;
+
+                source = dss_get_hdmi_venc_clk_source();
+
+                if (source == DSS_VENC_TV_CLK)
+                        t.y_res /= 2;
         }
 
-        dispc_mgr_set_size(channel, timings->x_res, timings->y_res);
+        dispc_mgr_set_size(channel, t.x_res, t.y_res);
 }
 
 static void dispc_mgr_set_lcd_divisor(enum omap_channel channel, u16 lck_div,
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 1dbf1550773e..09be43d02adf 100644
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -422,7 +422,6 @@ 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));
@@ -442,10 +441,7 @@ static int venc_power_on(struct omap_dss_device *dssdev)
 
         venc_write_reg(VENC_OUTPUT_CONTROL, l);
 
-        timings = dssdev->panel.timings;
-        timings.y_res /= 2;
-
-        dss_mgr_set_timings(dssdev->manager, &timings);
+        dss_mgr_set_timings(dssdev->manager, &dssdev->panel.timings);
 
         r = regulator_enable(venc.vdda_dac_reg);
         if (r)