Commit f0e5caab authored by Tomi Valkeinen's avatar Tomi Valkeinen

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 3375483e
This diff is collapsed.
...@@ -387,16 +387,16 @@ void dispc_enable_fifohandcheck(enum omap_channel channel, bool enable); ...@@ -387,16 +387,16 @@ void dispc_enable_fifohandcheck(enum omap_channel channel, bool enable);
void dispc_set_lcd_size(enum omap_channel channel, u16 width, u16 height); void dispc_set_lcd_size(enum omap_channel channel, u16 width, u16 height);
void dispc_set_digit_size(u16 width, u16 height); void dispc_set_digit_size(u16 width, u16 height);
u32 dispc_get_plane_fifo_size(enum omap_plane plane); u32 dispc_ovl_get_fifo_size(enum omap_plane plane);
void dispc_set_fifo_threshold(enum omap_plane plane, u32 low, u32 high); void dispc_ovl_set_fifo_threshold(enum omap_plane plane, u32 low, u32 high);
void dispc_enable_fifomerge(bool enable); void dispc_enable_fifomerge(bool enable);
u32 dispc_get_burst_size(enum omap_plane plane); u32 dispc_ovl_get_burst_size(enum omap_plane plane);
void dispc_enable_cpr(enum omap_channel channel, bool enable); void dispc_enable_cpr(enum omap_channel channel, bool enable);
void dispc_set_cpr_coef(enum omap_channel channel, void dispc_set_cpr_coef(enum omap_channel channel,
struct omap_dss_cpr_coefs *coefs); struct omap_dss_cpr_coefs *coefs);
void dispc_enable_gamma_table(bool enable); void dispc_enable_gamma_table(bool enable);
int dispc_setup_plane(enum omap_plane plane, int dispc_ovl_setup(enum omap_plane plane,
u32 paddr, u16 screen_width, u32 paddr, u16 screen_width,
u16 pos_x, u16 pos_y, u16 pos_x, u16 pos_y,
u16 width, u16 height, u16 width, u16 height,
...@@ -413,8 +413,8 @@ bool dispc_go_busy(enum omap_channel channel); ...@@ -413,8 +413,8 @@ bool dispc_go_busy(enum omap_channel channel);
void dispc_go(enum omap_channel channel); void dispc_go(enum omap_channel channel);
void dispc_enable_channel(enum omap_channel channel, bool enable); void dispc_enable_channel(enum omap_channel channel, bool enable);
bool dispc_is_channel_enabled(enum omap_channel channel); bool dispc_is_channel_enabled(enum omap_channel channel);
int dispc_enable_plane(enum omap_plane plane, bool enable); int dispc_ovl_enable(enum omap_plane plane, bool enable);
void dispc_enable_replication(enum omap_plane plane, bool enable); void dispc_ovl_enable_replication(enum omap_plane plane, bool enable);
void dispc_set_parallel_interface_mode(enum omap_channel channel, void dispc_set_parallel_interface_mode(enum omap_channel channel,
enum omap_parallel_interface_mode mode); enum omap_parallel_interface_mode mode);
......
...@@ -823,7 +823,7 @@ static int configure_overlay(enum omap_plane plane) ...@@ -823,7 +823,7 @@ static int configure_overlay(enum omap_plane plane)
oi = &c->info; oi = &c->info;
if (!c->enabled) { if (!c->enabled) {
dispc_enable_plane(plane, 0); dispc_ovl_enable(plane, 0);
return 0; return 0;
} }
...@@ -851,7 +851,7 @@ static int configure_overlay(enum omap_plane plane) ...@@ -851,7 +851,7 @@ static int configure_overlay(enum omap_plane plane)
/* If the overlay is outside the update region, disable it */ /* If the overlay is outside the update region, disable it */
if (!rectangle_intersects(mc->x, mc->y, mc->w, mc->h, if (!rectangle_intersects(mc->x, mc->y, mc->w, mc->h,
x, y, outw, outh)) { x, y, outw, outh)) {
dispc_enable_plane(plane, 0); dispc_ovl_enable(plane, 0);
return 0; return 0;
} }
...@@ -929,7 +929,7 @@ static int configure_overlay(enum omap_plane plane) ...@@ -929,7 +929,7 @@ static int configure_overlay(enum omap_plane plane)
} }
} }
r = dispc_setup_plane(plane, r = dispc_ovl_setup(plane,
paddr, paddr,
oi->screen_width, oi->screen_width,
x, y, x, y,
...@@ -947,16 +947,16 @@ static int configure_overlay(enum omap_plane plane) ...@@ -947,16 +947,16 @@ static int configure_overlay(enum omap_plane plane)
if (r) { if (r) {
/* this shouldn't happen */ /* this shouldn't happen */
DSSERR("dispc_setup_plane failed for ovl %d\n", plane); DSSERR("dispc_ovl_setup failed for ovl %d\n", plane);
dispc_enable_plane(plane, 0); dispc_ovl_enable(plane, 0);
return r; 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; return 0;
} }
...@@ -1437,11 +1437,11 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) ...@@ -1437,11 +1437,11 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
dssdev = ovl->manager->device; dssdev = ovl->manager->device;
size = dispc_get_plane_fifo_size(ovl->id); size = dispc_ovl_get_fifo_size(ovl->id);
if (use_fifomerge) if (use_fifomerge)
size *= 3; size *= 3;
burst_size = dispc_get_burst_size(ovl->id); burst_size = dispc_ovl_get_burst_size(ovl->id);
switch (dssdev->type) { switch (dssdev->type) {
case OMAP_DISPLAY_TYPE_DPI: case OMAP_DISPLAY_TYPE_DPI:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment