diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-07 08:48:45 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-18 09:15:04 -0400 |
commit | 5eeb55f8703d2af3181599c085b21ce023a0f942 (patch) | |
tree | d17774a6683e19ab1fa89048279946117b91a404 /drivers/video/omap2/dss/overlay.c | |
parent | 6b41785836f184df585e33cd6b940852fb9299ed (diff) |
OMAPDSS: cleanup dss_recheck_connections further
Cleanup dss_recheck_connections, move and rename it to a static
dss_init_connections function inside display.c. Improve the function to
return errors, and implement a matching dss_uninit_connections that can
be used to free the mgr->dssdev link.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/overlay.c')
-rw-r--r-- | drivers/video/omap2/dss/overlay.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c index 1bf05efffe13..52455a0609cb 100644 --- a/drivers/video/omap2/dss/overlay.c +++ b/drivers/video/omap2/dss/overlay.c | |||
@@ -105,38 +105,6 @@ void dss_init_overlays(struct platform_device *pdev) | |||
105 | } | 105 | } |
106 | } | 106 | } |
107 | 107 | ||
108 | /* connect overlays to the new device, if not already connected. if force | ||
109 | * selected, connect always. */ | ||
110 | void dss_recheck_connections(struct omap_dss_device *dssdev, bool force) | ||
111 | { | ||
112 | struct omap_overlay_manager *mgr = NULL; | ||
113 | int i; | ||
114 | |||
115 | mgr = omap_dss_get_overlay_manager(dssdev->channel); | ||
116 | |||
117 | if (!mgr->device || force) { | ||
118 | if (mgr->device) | ||
119 | mgr->unset_device(mgr); | ||
120 | mgr->set_device(mgr, dssdev); | ||
121 | } | ||
122 | |||
123 | if (mgr) { | ||
124 | dispc_runtime_get(); | ||
125 | |||
126 | for (i = 0; i < dss_feat_get_num_ovls(); i++) { | ||
127 | struct omap_overlay *ovl; | ||
128 | ovl = omap_dss_get_overlay(i); | ||
129 | if (!ovl->manager || force) { | ||
130 | if (ovl->manager) | ||
131 | ovl->unset_manager(ovl); | ||
132 | ovl->set_manager(ovl, mgr); | ||
133 | } | ||
134 | } | ||
135 | |||
136 | dispc_runtime_put(); | ||
137 | } | ||
138 | } | ||
139 | |||
140 | void dss_uninit_overlays(struct platform_device *pdev) | 108 | void dss_uninit_overlays(struct platform_device *pdev) |
141 | { | 109 | { |
142 | int i; | 110 | int i; |