aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-10-28 08:26:26 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-12-02 01:54:22 -0500
commitf427984e896fde6ae03056cf1f8ac5d4a99275d4 (patch)
tree2d265d0bcd24629118cf6fb646f82a3fcfcbe895 /drivers/video/omap2/dss
parentb952b553d23912b0b4a496b3e695db5e60c7a99a (diff)
OMAPDSS: DISPC: make dispc_ovl_set_channel_out() public
Make dispc_ovl_set_channel_out() public so that later patches can handle changing overlay's manager. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss')
-rw-r--r--drivers/video/omap2/dss/dispc.c3
-rw-r--r--drivers/video/omap2/dss/dss.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 5bbd838a657..5130f88516a 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -875,8 +875,7 @@ static void dispc_ovl_set_color_mode(enum omap_plane plane,
875 REG_FLD_MOD(DISPC_OVL_ATTRIBUTES(plane), m, 4, 1); 875 REG_FLD_MOD(DISPC_OVL_ATTRIBUTES(plane), m, 4, 1);
876} 876}
877 877
878static void dispc_ovl_set_channel_out(enum omap_plane plane, 878void dispc_ovl_set_channel_out(enum omap_plane plane, enum omap_channel channel)
879 enum omap_channel channel)
880{ 879{
881 int shift; 880 int shift;
882 u32 val; 881 u32 val;
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 7d2b6dd18e1..f899f0f6573 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -402,6 +402,8 @@ int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
402 bool ilace, enum omap_channel channel, bool replication, 402 bool ilace, enum omap_channel channel, bool replication,
403 u32 fifo_low, u32 fifo_high); 403 u32 fifo_low, u32 fifo_high);
404int dispc_ovl_enable(enum omap_plane plane, bool enable); 404int dispc_ovl_enable(enum omap_plane plane, bool enable);
405void dispc_ovl_set_channel_out(enum omap_plane plane,
406 enum omap_channel channel);
405 407
406 408
407void dispc_mgr_enable_fifohandcheck(enum omap_channel channel, bool enable); 409void dispc_mgr_enable_fifohandcheck(enum omap_channel channel, bool enable);