1 files changed, 15 insertions, 0 deletions

diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c
index 766c985cbfa7..6296a3e5124f 100644
--- a/drivers/video/fbdev/omap2/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/dss/dispc.c
@@ -1138,6 +1138,7 @@ static void dispc_init_fifos(void)
         int fifo;
         u8 start, end;
         u32 unit;
+        int i;
 
         unit = dss_feat_get_buffer_size_unit();
 
@@ -1177,6 +1178,20 @@ static void dispc_init_fifos(void)
                 dispc.fifo_assignment[OMAP_DSS_GFX] = OMAP_DSS_WB;
                 dispc.fifo_assignment[OMAP_DSS_WB] = OMAP_DSS_GFX;
         }
+
+        /*
+         * Setup default fifo thresholds.
+         */
+        for (i = 0; i < dss_feat_get_num_ovls(); ++i) {
+                u32 low, high;
+                const bool use_fifomerge = false;
+                const bool manual_update = false;
+
+                dispc_ovl_compute_fifo_thresholds(i, &low, &high,
+                        use_fifomerge, manual_update);
+
+                dispc_ovl_set_fifo_threshold(i, low, high);
+        }
 }
 
 static u32 dispc_ovl_get_fifo_size(enum omap_plane plane)