Commit bb23800c authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen

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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 8fe1d361
...@@ -66,8 +66,6 @@ static int tvc_enable(struct omap_dss_device *dssdev) ...@@ -66,8 +66,6 @@ static int tvc_enable(struct omap_dss_device *dssdev)
if (omapdss_device_is_enabled(dssdev)) if (omapdss_device_is_enabled(dssdev))
return 0; return 0;
src->ops->set_timings(src, &ddata->vm);
r = src->ops->enable(src); r = src->ops->enable(src);
if (r) if (r)
return r; return r;
......
...@@ -69,7 +69,6 @@ static void dvic_disconnect(struct omap_dss_device *src, ...@@ -69,7 +69,6 @@ static void dvic_disconnect(struct omap_dss_device *src,
static int dvic_enable(struct omap_dss_device *dssdev) 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; struct omap_dss_device *src = dssdev->src;
int r; int r;
...@@ -79,8 +78,6 @@ static int dvic_enable(struct omap_dss_device *dssdev) ...@@ -79,8 +78,6 @@ static int dvic_enable(struct omap_dss_device *dssdev)
if (omapdss_device_is_enabled(dssdev)) if (omapdss_device_is_enabled(dssdev))
return 0; return 0;
src->ops->set_timings(src, &ddata->vm);
r = src->ops->enable(src); r = src->ops->enable(src);
if (r) if (r)
return r; return r;
......
...@@ -71,8 +71,6 @@ static int hdmic_enable(struct omap_dss_device *dssdev) ...@@ -71,8 +71,6 @@ static int hdmic_enable(struct omap_dss_device *dssdev)
if (omapdss_device_is_enabled(dssdev)) if (omapdss_device_is_enabled(dssdev))
return 0; return 0;
src->ops->set_timings(src, &ddata->vm);
r = src->ops->enable(src); r = src->ops->enable(src);
if (r) if (r)
return r; return r;
......
...@@ -57,8 +57,6 @@ static int opa362_enable(struct omap_dss_device *dssdev) ...@@ -57,8 +57,6 @@ static int opa362_enable(struct omap_dss_device *dssdev)
if (omapdss_device_is_enabled(dssdev)) if (omapdss_device_is_enabled(dssdev))
return 0; return 0;
src->ops->set_timings(src, &ddata->vm);
r = src->ops->enable(src); r = src->ops->enable(src);
if (r) if (r)
return r; return r;
......
...@@ -50,8 +50,6 @@ static int tfp410_enable(struct omap_dss_device *dssdev) ...@@ -50,8 +50,6 @@ static int tfp410_enable(struct omap_dss_device *dssdev)
if (omapdss_device_is_enabled(dssdev)) if (omapdss_device_is_enabled(dssdev))
return 0; return 0;
src->ops->set_timings(src, &ddata->vm);
r = src->ops->enable(src); r = src->ops->enable(src);
if (r) if (r)
return r; return r;
......
...@@ -66,15 +66,12 @@ static void tpd_disconnect(struct omap_dss_device *src, ...@@ -66,15 +66,12 @@ static void tpd_disconnect(struct omap_dss_device *src,
static int tpd_enable(struct omap_dss_device *dssdev) 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; struct omap_dss_device *src = dssdev->src;
int r; int r;
if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
return 0; return 0;
src->ops->set_timings(src, &ddata->vm);
r = src->ops->enable(src); r = src->ops->enable(src);
if (r) if (r)
return r; return r;
......
...@@ -57,8 +57,6 @@ static int panel_dpi_enable(struct omap_dss_device *dssdev) ...@@ -57,8 +57,6 @@ static int panel_dpi_enable(struct omap_dss_device *dssdev)
if (omapdss_device_is_enabled(dssdev)) if (omapdss_device_is_enabled(dssdev))
return 0; return 0;
src->ops->set_timings(src, &ddata->vm);
r = src->ops->enable(src); r = src->ops->enable(src);
if (r) if (r)
return r; return r;
......
...@@ -142,8 +142,6 @@ static int lb035q02_enable(struct omap_dss_device *dssdev) ...@@ -142,8 +142,6 @@ static int lb035q02_enable(struct omap_dss_device *dssdev)
if (omapdss_device_is_enabled(dssdev)) if (omapdss_device_is_enabled(dssdev))
return 0; return 0;
src->ops->set_timings(src, &ddata->vm);
r = src->ops->enable(src); r = src->ops->enable(src);
if (r) if (r)
return r; return r;
......
...@@ -132,8 +132,6 @@ static int nec_8048_enable(struct omap_dss_device *dssdev) ...@@ -132,8 +132,6 @@ static int nec_8048_enable(struct omap_dss_device *dssdev)
if (omapdss_device_is_enabled(dssdev)) if (omapdss_device_is_enabled(dssdev))
return 0; return 0;
src->ops->set_timings(src, &ddata->vm);
r = src->ops->enable(src); r = src->ops->enable(src);
if (r) if (r)
return r; return r;
......
...@@ -80,8 +80,6 @@ static int sharp_ls_enable(struct omap_dss_device *dssdev) ...@@ -80,8 +80,6 @@ static int sharp_ls_enable(struct omap_dss_device *dssdev)
if (omapdss_device_is_enabled(dssdev)) if (omapdss_device_is_enabled(dssdev))
return 0; return 0;
src->ops->set_timings(src, &ddata->vm);
if (ddata->vcc) { if (ddata->vcc) {
r = regulator_enable(ddata->vcc); r = regulator_enable(ddata->vcc);
if (r != 0) if (r != 0)
......
...@@ -523,8 +523,6 @@ static int acx565akm_panel_power_on(struct omap_dss_device *dssdev) ...@@ -523,8 +523,6 @@ static int acx565akm_panel_power_on(struct omap_dss_device *dssdev)
dev_dbg(&ddata->spi->dev, "%s\n", __func__); dev_dbg(&ddata->spi->dev, "%s\n", __func__);
src->ops->set_timings(src, &ddata->vm);
r = src->ops->enable(src); r = src->ops->enable(src);
if (r) { if (r) {
pr_err("%s sdi enable failed\n", __func__); pr_err("%s sdi enable failed\n", __func__);
......
...@@ -187,8 +187,6 @@ static int td028ttec1_panel_enable(struct omap_dss_device *dssdev) ...@@ -187,8 +187,6 @@ static int td028ttec1_panel_enable(struct omap_dss_device *dssdev)
if (omapdss_device_is_enabled(dssdev)) if (omapdss_device_is_enabled(dssdev))
return 0; return 0;
src->ops->set_timings(src, &ddata->vm);
r = src->ops->enable(src); r = src->ops->enable(src);
if (r) if (r)
return r; return r;
......
...@@ -338,8 +338,6 @@ static int tpo_td043_enable(struct omap_dss_device *dssdev) ...@@ -338,8 +338,6 @@ static int tpo_td043_enable(struct omap_dss_device *dssdev)
if (omapdss_device_is_enabled(dssdev)) if (omapdss_device_is_enabled(dssdev))
return 0; return 0;
src->ops->set_timings(src, &ddata->vm);
r = src->ops->enable(src); r = src->ops->enable(src);
if (r) if (r)
return r; return r;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment