aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/omap_drv.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2018-02-28 10:30:30 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2018-09-03 09:13:26 -0400
commitec727e3f61845d6d64b3c5eba464096d6cc7f8e9 (patch)
treecd9e3c70b61ef8302d672b7f693166c16a14c36e /drivers/gpu/drm/omapdrm/omap_drv.c
parentb93109d7dc9e15649e1cf18281f02d8b4a102584 (diff)
drm/omap: dss: Add functions to connect and disconnect devices
The omap_dss_device objects model display components and are connected at runtime to create display pipelines. The connect and disconnect operations implemented by each component contain lots of duplicate code. As a first step towards fixing this, create new functions to wrap the direct calls to those operations and use them. 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/omap_drv.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_drv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index e411d46bd803..6bc4b01c8e9c 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -159,7 +159,7 @@ static void omap_disconnect_dssdevs(struct drm_device *ddev)
159 for (i = 0; i < priv->num_dssdevs; i++) { 159 for (i = 0; i < priv->num_dssdevs; i++) {
160 struct omap_dss_device *dssdev = priv->dssdevs[i]; 160 struct omap_dss_device *dssdev = priv->dssdevs[i];
161 161
162 dssdev->driver->disconnect(dssdev); 162 omapdss_device_disconnect(dssdev, NULL);
163 priv->dssdevs[i] = NULL; 163 priv->dssdevs[i] = NULL;
164 omap_dss_put_device(dssdev); 164 omap_dss_put_device(dssdev);
165 } 165 }
@@ -189,7 +189,7 @@ static int omap_connect_dssdevs(struct drm_device *ddev)
189 return -EPROBE_DEFER; 189 return -EPROBE_DEFER;
190 190
191 for_each_dss_dev(dssdev) { 191 for_each_dss_dev(dssdev) {
192 r = dssdev->driver->connect(dssdev); 192 r = omapdss_device_connect(dssdev, NULL);
193 if (r == -EPROBE_DEFER) { 193 if (r == -EPROBE_DEFER) {
194 omap_dss_put_device(dssdev); 194 omap_dss_put_device(dssdev);
195 goto cleanup; 195 goto cleanup;