diff options
| author | Archit Taneja <archit@ti.com> | 2012-09-26 15:12:39 +0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-26 15:58:31 +0400 |
| commit | 97f01b3a2ed6d46132bf4e2d237c27846e7b260a (patch) | |
| tree | 27c7a36c7ea6dbd51b6bf0a5edb04a861e8ac381 /drivers/video/omap2/dss/manager.c | |
| parent | 6d71b923e53184808b0206ebd74159c41a2dcf38 (diff) | |
| download | linux-97f01b3a2ed6d46132bf4e2d237c27846e7b260a.tar.xz | |
OMAPDSS: APPLY: Add manager set/unset output ops for omap_overlay_manager
Add set_output/unset_output ops for overlay managers, these form links between
managers and outputs. Create a function in dss features which tell all the
output instances that connect to a manager, use it when a manager tries to set
an output. Add a constraint of not unsetting an output when the manager is
enabled.
Keep the omap_dss_device pointer and set/unset_device ops in overlay_manager for
now to not break things. Keep the dss feature function get_supported_displays
as it's used in some places. These will be removed later.
Signed-off-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/manager.c')
| -rw-r--r-- | drivers/video/omap2/dss/manager.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c index 383314f222b0..92a2585d04b2 100644 --- a/drivers/video/omap2/dss/manager.c +++ b/drivers/video/omap2/dss/manager.c @@ -95,6 +95,8 @@ int dss_init_overlay_managers(struct platform_device *pdev) mgr->set_device = &dss_mgr_set_device; mgr->unset_device = &dss_mgr_unset_device; + mgr->set_output = &dss_mgr_set_output; + mgr->unset_output = &dss_mgr_unset_output; mgr->apply = &omap_dss_mgr_apply; mgr->set_manager_info = &dss_mgr_set_info; mgr->get_manager_info = &dss_mgr_get_info; @@ -104,6 +106,8 @@ int dss_init_overlay_managers(struct platform_device *pdev) mgr->caps = 0; mgr->supported_displays = dss_feat_get_supported_displays(mgr->id); + mgr->supported_outputs = + dss_feat_get_supported_outputs(mgr->id); INIT_LIST_HEAD(&mgr->overlays); |