aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/manager.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-11-15 06:37:33 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-12-02 01:54:40 -0500
commit5738b633136a41923b4ba75e6b1a160d08539c99 (patch)
treedefce896713834dca98dd78a88de5c45fc746a5e /drivers/video/omap2/dss/manager.c
parenteb70d739adf2266e744a784a1272f1c92a257b81 (diff)
OMAPDSS: remove ovl/mgr check-code temporarily
DSS currently tries to check that the given overlay and overlay manager settings are acceptable, but the code does not work quite properly. Things may change between the check and the actual use of the settings. Furthermore, the following patches will rewrite how settings are configured and managed, and trying to keep the (broken) settings checking working during the rewrite would be very difficult. This patch removes the checking code, and a working version of checking will be added back after the settings rewrite has been done. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/manager.c')
-rw-r--r--drivers/video/omap2/dss/manager.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index ab0b61b716f..d7fd494908d 100644
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -485,23 +485,6 @@ static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)
485 return omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout); 485 return omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);
486} 486}
487 487
488int dss_check_manager(struct omap_overlay_manager *mgr)
489{
490 if (dss_has_feature(FEAT_ALPHA_FIXED_ZORDER)) {
491 /*
492 * OMAP3 supports only graphics source transparency color key
493 * and alpha blending simultaneously. See TRM 15.4.2.4.2.2
494 * Alpha Mode
495 */
496 if (mgr->info.partial_alpha_enabled && mgr->info.trans_enabled
497 && mgr->info.trans_key_type !=
498 OMAP_DSS_COLOR_KEY_GFX_DST)
499 return -EINVAL;
500 }
501
502 return 0;
503}
504
505int dss_init_overlay_managers(struct platform_device *pdev) 488int dss_init_overlay_managers(struct platform_device *pdev)
506{ 489{
507 int i, r; 490 int i, r;