diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-08-16 14:25:00 +0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-09-30 17:16:23 +0400 |
commit | f0e5caab9771173a6c7a47add4b2e5174c7f11bb (patch) | |
tree | e9cd424c171fac6ab50cde6b6bf80074698a028d /drivers/video/omap2/dss/manager.c | |
parent | 3375483e91fd7a3fc0f0ab79f279014c45d8e07f (diff) | |
download | linux-f0e5caab9771173a6c7a47add4b2e5174c7f11bb.tar.xz |
OMAP: DSS2: DISPC: rename overlay related funcs
Rename dispc's overlay related functions as follows:
- Remove prepending underscores, which were originally used to inform
that the clocks needs to be enabled. This meaning is no longer valid.
- Prepend the functions with dispc_ovl_*
- Remove "plane" from the name, e.g. dispc_set_plane_ba0 ->
dispc_ovl_set_ba0
The idea is to group overlay related functions so that it can be deduced
from the function name that it writes to overlay spesific registers.
All dispc_ovl_* functions have enum omap_plane as the first parameter.
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 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c index eb7833ecaf32..c8e5fc6f0ccc 100644 --- a/drivers/video/omap2/dss/manager.c +++ b/drivers/video/omap2/dss/manager.c @@ -823,7 +823,7 @@ static int configure_overlay(enum omap_plane plane) oi = &c->info; if (!c->enabled) { - dispc_enable_plane(plane, 0); + dispc_ovl_enable(plane, 0); return 0; } @@ -851,7 +851,7 @@ static int configure_overlay(enum omap_plane plane) /* If the overlay is outside the update region, disable it */ if (!rectangle_intersects(mc->x, mc->y, mc->w, mc->h, x, y, outw, outh)) { - dispc_enable_plane(plane, 0); + dispc_ovl_enable(plane, 0); return 0; } @@ -929,7 +929,7 @@ static int configure_overlay(enum omap_plane plane) } } - r = dispc_setup_plane(plane, + r = dispc_ovl_setup(plane, paddr, oi->screen_width, x, y, @@ -947,16 +947,16 @@ static int configure_overlay(enum omap_plane plane) if (r) { /* this shouldn't happen */ - DSSERR("dispc_setup_plane failed for ovl %d\n", plane); - dispc_enable_plane(plane, 0); + DSSERR("dispc_ovl_setup failed for ovl %d\n", plane); + dispc_ovl_enable(plane, 0); return r; } - dispc_enable_replication(plane, c->replication); + dispc_ovl_enable_replication(plane, c->replication); - dispc_set_fifo_threshold(plane, c->fifo_low, c->fifo_high); + dispc_ovl_set_fifo_threshold(plane, c->fifo_low, c->fifo_high); - dispc_enable_plane(plane, 1); + dispc_ovl_enable(plane, 1); return 0; } @@ -1437,11 +1437,11 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) dssdev = ovl->manager->device; - size = dispc_get_plane_fifo_size(ovl->id); + size = dispc_ovl_get_fifo_size(ovl->id); if (use_fifomerge) size *= 3; - burst_size = dispc_get_burst_size(ovl->id); + burst_size = dispc_ovl_get_burst_size(ovl->id); switch (dssdev->type) { case OMAP_DISPLAY_TYPE_DPI: |