diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-11-03 17:03:44 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-12-02 08:54:26 +0200 |
| commit | 2cc5d1af5ad0a130fa5812f99bca18e0cdadbd36 (patch) | |
| tree | 67d36ccc07db2e30f7f91e8f5c276bacf4bd6b17 /drivers/video/omap2/dss/manager.c | |
| parent | f38545da53d98055d8b2f58fe156c86626f3427e (diff) | |
| download | op-kernel-dev-2cc5d1af5ad0a130fa5812f99bca18e0cdadbd36.zip op-kernel-dev-2cc5d1af5ad0a130fa5812f99bca18e0cdadbd36.tar.gz | |
OMAPDSS: separate overlay channel from ovl_setup
Overlay channel is configured with ovl_setup, with all the other overlay
attriutes. This patch separates overlay channel setup so that we can
later configure the channel only when needed.
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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c index 31637ba..ec98e17 100644 --- a/drivers/video/omap2/dss/manager.c +++ b/drivers/video/omap2/dss/manager.c @@ -777,7 +777,9 @@ static int configure_overlay(enum omap_plane plane) ilace = ovl->manager->device->type == OMAP_DISPLAY_TYPE_VENC; - r = dispc_ovl_setup(plane, oi, ilace, c->channel, replication); + dispc_ovl_set_channel_out(plane, c->channel); + + r = dispc_ovl_setup(plane, oi, ilace, replication); if (r) { /* this shouldn't happen */ DSSERR("dispc_ovl_setup failed for ovl %d\n", plane); |
