1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index 7ebaa40d3b5..49c0d77a5f2 100644
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -507,7 +507,6 @@ struct overlay_cache_data {
         bool replication;
         bool ilace;
 
-        enum omap_burst_size burst_size;
         u32 fifo_low;
         u32 fifo_high;
 };
@@ -947,8 +946,7 @@ static int configure_overlay(enum omap_plane plane)
 
         dispc_enable_replication(plane, c->replication);
 
-        dispc_set_burst_size(plane, c->burst_size);
-        dispc_setup_plane_fifo(plane, c->fifo_low, c->fifo_high);
+        dispc_set_fifo_threshold(plane, c->fifo_low, c->fifo_high);
 
         dispc_enable_plane(plane, 1);
 
@@ -1417,7 +1415,7 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
         /* Configure overlay fifos */
         for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
                 struct omap_dss_device *dssdev;
-                u32 size;
+                u32 size, burst_size;
 
                 ovl = omap_dss_get_overlay(i);
 
@@ -1435,6 +1433,8 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
                 if (use_fifomerge)
                         size *= 3;
 
+                burst_size = dispc_get_burst_size(ovl->id);
+
                 switch (dssdev->type) {
                 case OMAP_DISPLAY_TYPE_DPI:
                 case OMAP_DISPLAY_TYPE_DBI:
@@ -1442,13 +1442,13 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
                 case OMAP_DISPLAY_TYPE_VENC:
                 case OMAP_DISPLAY_TYPE_HDMI:
                         default_get_overlay_fifo_thresholds(ovl->id, size,
-                                        &oc->burst_size, &oc->fifo_low,
+                                        burst_size, &oc->fifo_low,
                                         &oc->fifo_high);
                         break;
 #ifdef CONFIG_OMAP2_DSS_DSI
                 case OMAP_DISPLAY_TYPE_DSI:
                         dsi_get_overlay_fifo_thresholds(ovl->id, size,
-                                        &oc->burst_size, &oc->fifo_low,
+                                        burst_size, &oc->fifo_low,
                                         &oc->fifo_high);
                         break;
 #endif