diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-11-03 17:00:07 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-12-02 08:54:26 +0200 |
| commit | f38545da53d98055d8b2f58fe156c86626f3427e (patch) | |
| tree | 8bd2fb904e2951d7145a072156be27ef30f9e14e /drivers/video/omap2/dss/manager.c | |
| parent | 3ba2a1c01546a4980e7b7742445560ae4afd1fc1 (diff) | |
| download | linux-3.10-f38545da53d98055d8b2f58fe156c86626f3427e.tar.gz linux-3.10-f38545da53d98055d8b2f58fe156c86626f3427e.tar.bz2 linux-3.10-f38545da53d98055d8b2f58fe156c86626f3427e.zip | |
OMAPDSS: separate FIFO threshold setup from ovl_setup
Overlay FIFO thresholds are configured with ovl_setup, with all the
other overlay attributes. This patch separates FIFO threshold setup so
that we can later configure FIFO thresholds only when needed.
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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c index d8d0d11d95d..31637ba58f5 100644 --- a/drivers/video/omap2/dss/manager.c +++ b/drivers/video/omap2/dss/manager.c @@ -777,8 +777,7 @@ static int configure_overlay(enum omap_plane plane) ilace = ovl->manager->device->type == OMAP_DISPLAY_TYPE_VENC; - r = dispc_ovl_setup(plane, oi, ilace, c->channel, - replication, c->fifo_low, c->fifo_high); + r = dispc_ovl_setup(plane, oi, ilace, c->channel, replication); if (r) { /* this shouldn't happen */ DSSERR("dispc_ovl_setup failed for ovl %d\n", plane); @@ -786,6 +785,8 @@ static int configure_overlay(enum omap_plane plane) return r; } + dispc_ovl_set_fifo_threshold(plane, c->fifo_low, c->fifo_high); + dispc_ovl_enable(plane, 1); return 0; |