aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/manager.c
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2011-09-14 02:22:54 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-09-30 09:17:25 -0400
commitc3d92529c3c2d7b511903d98efc1537081e62eca (patch)
treeec5d614c8b03da53feb43fd4112aafa6caa8ab75 /drivers/video/omap2/dss/manager.c
parenta4273b7cca6fe7ee3807229ba256adb6cfaba0c3 (diff)
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 <archit@ti.com> 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.c7
1 files changed, 2 insertions, 5 deletions
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)
940 new_oi.out_height = outh; 940 new_oi.out_height = outh;
941 new_oi.paddr = paddr; 941 new_oi.paddr = paddr;
942 942
943 r = dispc_ovl_setup(plane, &new_oi, c->ilace, c->channel); 943 r = dispc_ovl_setup(plane, &new_oi, c->ilace, c->channel,
944 c->replication, c->fifo_low, c->fifo_high);
944 if (r) { 945 if (r) {
945 /* this shouldn't happen */ 946 /* this shouldn't happen */
946 DSSERR("dispc_ovl_setup failed for ovl %d\n", plane); 947 DSSERR("dispc_ovl_setup failed for ovl %d\n", plane);
@@ -948,10 +949,6 @@ static int configure_overlay(enum omap_plane plane)
948 return r; 949 return r;
949 } 950 }
950 951
951 dispc_ovl_enable_replication(plane, c->replication);
952
953 dispc_ovl_set_fifo_threshold(plane, c->fifo_low, c->fifo_high);
954
955 dispc_ovl_enable(plane, 1); 952 dispc_ovl_enable(plane, 1);
956 953
957 return 0; 954 return 0;