drm/omap: Store CRTC timings in .set_timings() operation

The video timings are stored in the CRTC structure by the
omap_crtc_dss_set_timings() function, called by dss_mgr_set_timings()
from the .enable() operation of the internal encoders. This instead
belongs to the .set_timings() code paths. Move the
omap_crtc_dss_set_timings() calls accordingly.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 2a4ad732679f9a3ed7429cf3523d3680c0e4117e..223586788648a1d5c9f98319e28dd0ab148b5cc0 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -361,8 +361,6 @@ static int dpi_set_mode(struct dpi_data *dpi)
        if (r)
                return r;
 
-       dss_mgr_set_timings(&dpi->output, vm);
-
        return 0;
 }
 
@@ -479,6 +477,8 @@ static void dpi_set_timings(struct omap_dss_device *dssdev,
 
        dpi->vm = *vm;
 
+       dss_mgr_set_timings(&dpi->output, vm);
+
        mutex_unlock(&dpi->lock);
 }
 

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index d1734ea2534a850f07d2a8cbda600ea3be24313c..394c129cfb3bb8e03b8970fc839656e3d25becd5 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -3901,8 +3901,6 @@ static void dsi_update_screen_dispc(struct dsi_data *dsi)
                msecs_to_jiffies(250));
        BUG_ON(r == 0);
 
-       dss_mgr_set_timings(&dsi->output, &dsi->vm);
-
        dss_mgr_start_update(&dsi->output);
 
        if (dsi->te_enabled) {
@@ -4044,8 +4042,6 @@ static int dsi_display_init_dispc(struct dsi_data *dsi)
                dsi->mgr_config.fifohandcheck = false;
        }
 
-       dss_mgr_set_timings(&dsi->output, &dsi->vm);
-
        r = dsi_configure_dispc_clocks(dsi);
        if (r)
                goto err1;
@@ -4756,6 +4752,8 @@ static int dsi_set_config(struct omap_dss_device *dssdev,
        dsi->vm.flags &= ~DISPLAY_FLAGS_VSYNC_LOW;
        dsi->vm.flags |= DISPLAY_FLAGS_VSYNC_HIGH;
 
+       dss_mgr_set_timings(&dsi->output, &dsi->vm);
+
        dsi->vm_timings = ctx.dsi_vm;
 
        mutex_unlock(&dsi->lock);

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 7ad173098c224100496bd9d3cf202569802b2555..df7cfb3e2b12e9778246b9952bd3b1c056ab1cfb 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -207,9 +207,6 @@ static int hdmi_power_on_full(struct omap_hdmi *hdmi)
 
        hdmi4_configure(&hdmi->core, &hdmi->wp, &hdmi->cfg);
 
-       /* tv size */
-       dss_mgr_set_timings(&hdmi->output, vm);
-
        r = dss_mgr_enable(&hdmi->output);
        if (r)
                goto err_mgr_enable;
@@ -262,6 +259,8 @@ static void hdmi_display_set_timings(struct omap_dss_device *dssdev,
 
        dispc_set_tv_pclk(hdmi->dss->dispc, vm->pixelclock);
 
+       dss_mgr_set_timings(&hdmi->output, vm);
+
        mutex_unlock(&hdmi->lock);
 }
 

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index 147c3550df517a70487a1fe3aea80ff096aad2a2..cb212e5e790f3317598cdf3c06ee1b4119e17c64 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -206,9 +206,6 @@ static int hdmi_power_on_full(struct omap_hdmi *hdmi)
 
        hdmi5_configure(&hdmi->core, &hdmi->wp, &hdmi->cfg);
 
-       /* tv size */
-       dss_mgr_set_timings(&hdmi->output, vm);
-
        r = dss_mgr_enable(&hdmi->output);
        if (r)
                goto err_mgr_enable;
@@ -261,6 +258,8 @@ static void hdmi_display_set_timings(struct omap_dss_device *dssdev,
 
        dispc_set_tv_pclk(hdmi->dss->dispc, vm->pixelclock);
 
+       dss_mgr_set_timings(&hdmi->output, vm);
+
        mutex_unlock(&hdmi->lock);
 }
 

diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index e98c1b6e3d2d4b7090cf36a1706574c21e05dbd3..36edcdbf06097c1a68a9fe9eb39c21676ebb6d50 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -155,8 +155,6 @@ static int sdi_display_enable(struct omap_dss_device *dssdev)
 
        sdi->mgr_config.clock_info = dispc_cinfo;
 
-       dss_mgr_set_timings(&sdi->output, &sdi->vm);
-
        r = dss_set_fck_rate(sdi->dss, fck);
        if (r)
                goto err_set_dss_clock_div;
@@ -220,6 +218,8 @@ static void sdi_set_timings(struct omap_dss_device *dssdev,
        struct sdi_device *sdi = dssdev_to_sdi(dssdev);
 
        sdi->vm = *vm;
+
+       dss_mgr_set_timings(&sdi->output, vm);
 }
 
 static int sdi_check_timings(struct omap_dss_device *dssdev,

diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index 126efbf898984ce374356ed8d693eebd30e511c4..39e3c43c54c1da27cf088f3fcb396521292b5a8f 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -491,8 +491,6 @@ static int venc_power_on(struct venc_device *venc)
 
        venc_write_reg(venc, VENC_OUTPUT_CONTROL, l);
 
-       dss_mgr_set_timings(&venc->output, &venc->vm);
-
        r = regulator_enable(venc->vdda_dac_reg);
        if (r)
                goto err1;
@@ -595,6 +593,8 @@ static void venc_set_timings(struct omap_dss_device *dssdev,
 
        dispc_set_tv_pclk(venc->dss->dispc, 13500000);
 
+       dss_mgr_set_timings(&venc->output, vm);
+
        mutex_unlock(&venc->venc_lock);
 }