diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2018-06-07 19:55:04 +0300 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2018-09-03 16:13:30 +0300 |
commit | 6ea48430952323091194100d48c5610b9cd286b4 (patch) | |
tree | 25b8e6fa2fea6338ef76de63e42ede79452fc670 /drivers/gpu/drm/omapdrm/dss | |
parent | d8dbe79143764b86bd04c63c044431565582a22d (diff) | |
download | linux-6ea48430952323091194100d48c5610b9cd286b4.tar.xz |
drm/omap: Don't call .set_timings() operation recursively
Instead of calling the .set_timings() operation recursively from the
display device backwards, iterate over the devices manually in the DRM
encoder code. This moves the complexity to a single central location and
simplifies the logic in omap_dss_device drivers.
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>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss')
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dpi.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/sdi.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/venc.c | 2 |
5 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c index 223586788648..ca4f3c4c6318 100644 --- a/drivers/gpu/drm/omapdrm/dss/dpi.c +++ b/drivers/gpu/drm/omapdrm/dss/dpi.c @@ -477,8 +477,6 @@ 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/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c index df7cfb3e2b12..cf6230eac31a 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c @@ -259,8 +259,6 @@ 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 cb212e5e790f..b0e4a7463f8c 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c @@ -258,8 +258,6 @@ 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 36edcdbf0609..b2fe2387037a 100644 --- a/drivers/gpu/drm/omapdrm/dss/sdi.c +++ b/drivers/gpu/drm/omapdrm/dss/sdi.c @@ -218,8 +218,6 @@ 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 39e3c43c54c1..ff0b18c8e4ac 100644 --- a/drivers/gpu/drm/omapdrm/dss/venc.c +++ b/drivers/gpu/drm/omapdrm/dss/venc.c @@ -593,8 +593,6 @@ 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); } |