drm/omap: Remove duplicate calls to .set_timings() operation

The omap_dss_device .set_timings() operations are called directly from
omap_encoder_update(), and indirectly from the omap_dss_device .enable()
operation. The latter is called from omap_encoder_enable(), right after
calling omap_encoder_update(). The .set_timings() operation it thus
called twice in a row. Fix it by removing the indirect call.

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/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index 22bc2e734b0b966505f28f81f8768359582dd173..fb6d4fce185334cecef4c914abfd7654b59dfa79 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -66,8 +66,6 @@ static int tvc_enable(struct omap_dss_device *dssdev)
        if (omapdss_device_is_enabled(dssdev))
                return 0;
 
-       src->ops->set_timings(src, &ddata->vm);
-
        r = src->ops->enable(src);
        if (r)
                return r;

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index 8f953303ece6914b2978b746e80374a130ff5e0c..b89555ed53a08b8ee747185814fe9e104a2bcfe3 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -69,7 +69,6 @@ static void dvic_disconnect(struct omap_dss_device *src,
 
 static int dvic_enable(struct omap_dss_device *dssdev)
 {
-       struct panel_drv_data *ddata = to_panel_data(dssdev);
        struct omap_dss_device *src = dssdev->src;
        int r;
 
@@ -79,8 +78,6 @@ static int dvic_enable(struct omap_dss_device *dssdev)
        if (omapdss_device_is_enabled(dssdev))
                return 0;
 
-       src->ops->set_timings(src, &ddata->vm);
-
        r = src->ops->enable(src);
        if (r)
                return r;

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index 1cbc593c79ffd7afa60b39d71095a2fe9e0792f4..898eb583688f14942013f5788ccc8800a7af4406 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -71,8 +71,6 @@ static int hdmic_enable(struct omap_dss_device *dssdev)
        if (omapdss_device_is_enabled(dssdev))
                return 0;
 
-       src->ops->set_timings(src, &ddata->vm);
-
        r = src->ops->enable(src);
        if (r)
                return r;

diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index 19d1804e3fe5e8156d2a38f0c8bb1d2f229c8e0c..824f302a515b560fc7ebfeca393dc0fe3735759e 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -57,8 +57,6 @@ static int opa362_enable(struct omap_dss_device *dssdev)
        if (omapdss_device_is_enabled(dssdev))
                return 0;
 
-       src->ops->set_timings(src, &ddata->vm);
-
        r = src->ops->enable(src);
        if (r)
                return r;

diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
index fa6ed1e8649de54e167a0f9cd40fdaa799ed29d0..de42339808984642a79fd21cf7a1b6149d9bf56f 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
@@ -50,8 +50,6 @@ static int tfp410_enable(struct omap_dss_device *dssdev)
        if (omapdss_device_is_enabled(dssdev))
                return 0;
 
-       src->ops->set_timings(src, &ddata->vm);
-
        r = src->ops->enable(src);
        if (r)
                return r;

diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
index 21c2667f9f069b3312010448cd942c9be4ce7b9f..d9a590244eaafdfbdddb74ed435e273f51f13bc3 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
@@ -66,15 +66,12 @@ static void tpd_disconnect(struct omap_dss_device *src,
 
 static int tpd_enable(struct omap_dss_device *dssdev)
 {
-       struct panel_drv_data *ddata = to_panel_data(dssdev);
        struct omap_dss_device *src = dssdev->src;
        int r;
 
        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
                return 0;
 
-       src->ops->set_timings(src, &ddata->vm);
-
        r = src->ops->enable(src);
        if (r)
                return r;

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
index b2f17b2a93b2d66c67d96831e004fcffb4b5b6ea..32efed45a63c1d591c61f35a8973a799e1c7b026 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
@@ -57,8 +57,6 @@ static int panel_dpi_enable(struct omap_dss_device *dssdev)
        if (omapdss_device_is_enabled(dssdev))
                return 0;
 
-       src->ops->set_timings(src, &ddata->vm);
-
        r = src->ops->enable(src);
        if (r)
                return r;

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
index 1121d1eba76bface894bcd7217d5dd2b3424dda7..ffa69fd44d87ddf6a04f885f99ae9115b9f7aeba 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
@@ -142,8 +142,6 @@ static int lb035q02_enable(struct omap_dss_device *dssdev)
        if (omapdss_device_is_enabled(dssdev))
                return 0;
 
-       src->ops->set_timings(src, &ddata->vm);
-
        r = src->ops->enable(src);
        if (r)
                return r;

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
index 248a8f1ea7dfa96cc6ee7b270bd230a835b7df12..26af95a71eaba910f5ae7d074d45a67782c6e0a6 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
@@ -132,8 +132,6 @@ static int nec_8048_enable(struct omap_dss_device *dssdev)
        if (omapdss_device_is_enabled(dssdev))
                return 0;
 
-       src->ops->set_timings(src, &ddata->vm);
-
        r = src->ops->enable(src);
        if (r)
                return r;

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
index ef696e1e7d4532456f2353044dd7ab81a7e10d1f..a83cd9f4bdb075575af91c1a3e68d25b81263583 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
@@ -80,8 +80,6 @@ static int sharp_ls_enable(struct omap_dss_device *dssdev)
        if (omapdss_device_is_enabled(dssdev))
                return 0;
 
-       src->ops->set_timings(src, &ddata->vm);
-
        if (ddata->vcc) {
                r = regulator_enable(ddata->vcc);
                if (r != 0)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
index 7be58da1075f68dd882333b22eef304d1f8b060c..8e45c5e64efa648a1b92ef6756d253cab78a0b8d 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
@@ -523,8 +523,6 @@ static int acx565akm_panel_power_on(struct omap_dss_device *dssdev)
 
        dev_dbg(&ddata->spi->dev, "%s\n", __func__);
 
-       src->ops->set_timings(src, &ddata->vm);
-
        r = src->ops->enable(src);
        if (r) {
                pr_err("%s sdi enable failed\n", __func__);

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
index 087f62f4311bf2a3b2039f20fefdeec1fddf6144..b2a16c470f73dc033721689bc3a8706dae25a676 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
@@ -187,8 +187,6 @@ static int td028ttec1_panel_enable(struct omap_dss_device *dssdev)
        if (omapdss_device_is_enabled(dssdev))
                return 0;
 
-       src->ops->set_timings(src, &ddata->vm);
-
        r = src->ops->enable(src);
        if (r)
                return r;

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
index 7bc602dfb84a9c8223cb8ec68c8849f65364c054..42f80b3ec350047844b000ec6ef9976866d1b027 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
@@ -338,8 +338,6 @@ static int tpo_td043_enable(struct omap_dss_device *dssdev)
        if (omapdss_device_is_enabled(dssdev))
                return 0;
 
-       src->ops->set_timings(src, &ddata->vm);
-
        r = src->ops->enable(src);
        if (r)
                return r;