From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: dri-devel@lists.freedesktop.org
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: [PATCH v2 05/22] drm/omap: Remove duplicate calls to .set_timings() operation
Date: Mon, 6 Aug 2018 23:36:45 +0300 [thread overview]
Message-ID: <20180806203702.16961-6-laurent.pinchart@ideasonboard.com> (raw)
In-Reply-To: <20180806203702.16961-1-laurent.pinchart@ideasonboard.com>
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>
---
drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c | 2 --
drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 3 ---
drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 2 --
drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 2 --
drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 2 --
drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 3 ---
drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 2 --
drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c | 2 --
drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c | 2 --
drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 2 --
drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c | 2 --
drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c | 2 --
drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c | 2 --
13 files changed, 28 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index 22bc2e734b0b..fb6d4fce1853 100644
--- 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 8f953303ece6..b89555ed53a0 100644
--- 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 1cbc593c79ff..898eb583688f 100644
--- 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 19d1804e3fe5..824f302a515b 100644
--- 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 fa6ed1e8649d..de4233980898 100644
--- 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 21c2667f9f06..d9a590244eaa 100644
--- 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 b2f17b2a93b2..32efed45a63c 100644
--- 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 1121d1eba76b..ffa69fd44d87 100644
--- 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 248a8f1ea7df..26af95a71eab 100644
--- 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 ef696e1e7d45..a83cd9f4bdb0 100644
--- 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 7be58da1075f..8e45c5e64efa 100644
--- 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 087f62f4311b..b2a16c470f73 100644
--- 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 7bc602dfb84a..42f80b3ec350 100644
--- 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;
--
Regards,
Laurent Pinchart
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2018-08-06 20:36 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-06 20:22 [PATCH v2 00/21] omapdrm: Rework the HPD-related operations Laurent Pinchart
2018-08-06 20:22 ` [PATCH v2 01/21] drm/omap: dss: Remove unused omap_dss_driver operations Laurent Pinchart
2018-08-06 20:22 ` [PATCH v2 02/21] drm/omap: dss: Remove omap_dss_driver .[gs]et_mirror operations Laurent Pinchart
2018-08-06 20:22 ` [PATCH v2 03/21] drm/omap: Remove unnecessary display output sanity checks Laurent Pinchart
2018-08-06 20:22 ` [PATCH v2 04/21] drm/omap: Check omap_dss_device type based on the output_type field Laurent Pinchart
2018-08-06 20:28 ` [PATCH v2.1 " Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 00/22] omapdrm: Rework the timing-related operations Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 01/22] drm/omap: Pass both output and display omap_dss_device to connector init Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 02/22] drm/omap: Determine connector type directly in omap_connector.c Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 03/22] drm/omap: dss: hdmi: Rename hdmi_display_(set|check)_timing() functions Laurent Pinchart
2018-08-13 10:50 ` Tomi Valkeinen
2018-08-19 10:59 ` Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 04/22] drm/omap: Make the video_mode pointer to .set_timings() const Laurent Pinchart
2018-08-06 20:36 ` Laurent Pinchart [this message]
2018-08-06 20:36 ` [PATCH v2 06/22] drm/omap: Remove unneeded fallback for missing .check_timings() Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 07/22] drm/omap: Don't store video mode internally for external encoders Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 08/22] drm/omap: Store bus flags in the omap_dss_device structure Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 09/22] drm/omap: Don't call .check_timings() operation recursively Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 10/22] drm/omap: Query timing information from analog TV encoder Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 11/22] drm/omap: Remove .get_timings() operation from display connectors Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 12/22] drm/omap: panels: Don't modify fixed timings Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 13/22] drm/omap: Move bus flag hack to encoder implementation Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 14/22] drm/omap: Split mode fixup and mode set from encoder enable Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 15/22] drm/omap: Call dispc timings check operation directly Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 16/22] drm/omap: dpi: Don't fixup video mode in dpi_set_mode() Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 17/22] drm/omap: dsi: Fixup video mode in .set_config() operation Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 18/22] drm/omap: hdmi: Constify video mode and related pointers Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 19/22] drm/omap: sdi: Fixup video mode in .check_timings() operation Laurent Pinchart
2018-08-06 20:37 ` [PATCH v2 20/22] drm/omap: venc: " Laurent Pinchart
2018-08-06 20:37 ` [PATCH v2 21/22] drm/omap: Store CRTC timings in .set_timings() operation Laurent Pinchart
2018-08-06 20:37 ` [PATCH v2 22/22] drm/omap: Don't call .set_timings() operation recursively Laurent Pinchart
2018-08-13 11:12 ` [PATCH v2 00/22] omapdrm: Rework the timing-related operations Tomi Valkeinen
2018-08-13 19:24 ` Sebastian Reichel
2018-08-19 10:53 ` Laurent Pinchart
2018-08-20 11:24 ` Tomi Valkeinen
2018-08-20 11:33 ` Laurent Pinchart
2018-08-06 20:22 ` [PATCH v2 05/21] drm/omap: connector-hdmi: Convert to the GPIO descriptors API Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 06/21] drm/omap: encoder-tfp410: " Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 07/21] drm/omap: panel-nec-nl8048hl11: " Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 08/21] drm/omap: panel-sony-acx565akm: " Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 09/21] drm/omap: panel-tpo-td028ttec1: Drop unneeded linux/gpio.h header Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 10/21] drm/omap: panel-tpo-td043mtea1: Convert to the GPIO descriptors API Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 11/21] drm/omap: Move most omap_dss_driver operations to omap_dss_device_ops Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 12/21] drm/omap: dss: Add device operations flags Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 13/21] drm/omap: Don't call .detect() operation recursively Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 14/21] drm/omap: Don't call HPD registration operations recursively Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 15/21] drm/omap: Remove unneeded safety checks in the HPD operations Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 16/21] drm/omap: Merge HPD enable operation with HPD callback registration Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 17/21] drm/omap: Move HPD disconnection handling to omap_connector Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 18/21] drm/omap: Don't call EDID read operation recursively Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 19/21] drm/omap: Get from CRTC to display device directly Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 20/21] drm/omap: Pass both output and display omap_dss_device to encoder init Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 21/21] drm/omap: Don't call HDMI mode and infoframe operations recursively Laurent Pinchart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180806203702.16961-6-laurent.pinchart@ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=tomi.valkeinen@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.