From c3d92529c3c2d7b511903d98efc1537081e62eca Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Wed, 14 Sep 2011 11:52:54 +0530 Subject: OMAPDSS: DISPC: Pass overlay params as arguments to dispc_ovl_setup() dispc_ovl_enable_replication() and dispc_ovl_set_fifo_threshold() are currently called in configure_overlay(). These are the only functions which cause DISPC register writes of overlay parameters outside of dispc_ovl_setup(). Move these to dispc_ovl_setup() and pass replication, fifo_low and fifo_high thresholds as arguments to dispc_ovl_setup() in order to be aligned with other overlay parameters. No functional changes are made. Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/manager.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'drivers/video/omap2/dss/manager.c') diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c index f1c334c275e2..fdbbeebcd75c 100644 --- a/drivers/video/omap2/dss/manager.c +++ b/drivers/video/omap2/dss/manager.c @@ -940,7 +940,8 @@ static int configure_overlay(enum omap_plane plane) new_oi.out_height = outh; new_oi.paddr = paddr; - r = dispc_ovl_setup(plane, &new_oi, c->ilace, c->channel); + r = dispc_ovl_setup(plane, &new_oi, c->ilace, c->channel, + c->replication, c->fifo_low, c->fifo_high); if (r) { /* this shouldn't happen */ DSSERR("dispc_ovl_setup failed for ovl %d\n", plane); @@ -948,10 +949,6 @@ static int configure_overlay(enum omap_plane plane) return r; } - dispc_ovl_enable_replication(plane, c->replication); - - dispc_ovl_set_fifo_threshold(plane, c->fifo_low, c->fifo_high); - dispc_ovl_enable(plane, 1); return 0; -- cgit v1.2.1