diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-11-15 12:37:33 +0100 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-12-02 07:54:40 +0100 |
| commit | 5738b633136a41923b4ba75e6b1a160d08539c99 (patch) | |
| tree | defce896713834dca98dd78a88de5c45fc746a5e /drivers/video/omap2/dss/manager.c | |
| parent | OMAPDSS: APPLY: move mgr funcs to apply.c (diff) | |
| download | linux-5738b633136a41923b4ba75e6b1a160d08539c99.tar.xz linux-5738b633136a41923b4ba75e6b1a160d08539c99.zip | |
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.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c index ab0b61b716f1..d7fd494908d8 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) return omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout); } -int dss_check_manager(struct omap_overlay_manager *mgr) -{ - if (dss_has_feature(FEAT_ALPHA_FIXED_ZORDER)) { - /* - * OMAP3 supports only graphics source transparency color key - * and alpha blending simultaneously. See TRM 15.4.2.4.2.2 - * Alpha Mode - */ - if (mgr->info.partial_alpha_enabled && mgr->info.trans_enabled - && mgr->info.trans_key_type != - OMAP_DSS_COLOR_KEY_GFX_DST) - return -EINVAL; - } - - return 0; -} - int dss_init_overlay_managers(struct platform_device *pdev) { int i, r; |