1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index ddb9d9d28157..c732d6c70c66 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -2869,8 +2869,8 @@ int dispc_wb_setup(const struct omap_dss_writeback_info *wi,
         } else {
                 int wbdelay;
 
-                wbdelay = min(mgr_timings->vfp + mgr_timings->vsync_len +
-                        mgr_timings->vbp, 255);
+                wbdelay = min(mgr_timings->vfront_porch +
+                              mgr_timings->vsync_len + mgr_timings->vbp, 255);
 
                 /* WBDELAYCOUNT */
                 REG_FLD_MOD(DISPC_OVL_ATTRIBUTES2(plane), wbdelay, 7, 0);
@@ -3133,7 +3133,8 @@ bool dispc_mgr_timings_ok(enum omap_channel channel,
 
                 if (!_dispc_lcd_timings_ok(timings->hsync_len,
                                 timings->hfront_porch, timings->hback_porch,
-                                timings->vsync_len, timings->vfp, timings->vbp))
+                                timings->vsync_len, timings->vfront_porch,
+                                timings->vbp))
                         return false;
         }
 
@@ -3270,12 +3271,12 @@ void dispc_mgr_set_timings(enum omap_channel channel,
 
         if (dss_mgr_is_lcd(channel)) {
                 _dispc_mgr_set_lcd_timings(channel, t.hsync_len, t.hfront_porch,
-                                t.hback_porch, t.vsync_len, t.vfp, t.vbp,
+                                t.hback_porch, t.vsync_len, t.vfront_porch, t.vbp,
                                 t.vsync_level, t.hsync_level, t.data_pclk_edge,
                                 t.de_level, t.sync_pclk_edge);
 
                 xtot = t.hactive + t.hfront_porch + t.hsync_len + t.hback_porch;
-                ytot = t.vactive + t.vfp + t.vsync_len + t.vbp;
+                ytot = t.vactive + t.vfront_porch + t.vsync_len + t.vbp;
 
                 ht = timings->pixelclock / xtot;
                 vt = timings->pixelclock / xtot / ytot;
@@ -3283,7 +3284,7 @@ void dispc_mgr_set_timings(enum omap_channel channel,
                 DSSDBG("pck %u\n", timings->pixelclock);
                 DSSDBG("hsync_len %d hfp %d hbp %d vsw %d vfp %d vbp %d\n",
                         t.hsync_len, t.hfront_porch, t.hback_porch,
-                        t.vsync_len, t.vfp, t.vbp);
+                        t.vsync_len, t.vfront_porch, t.vbp);
                 DSSDBG("vsync_level %d hsync_level %d data_pclk_edge %d de_level %d sync_pclk_edge %d\n",
                         t.vsync_level, t.hsync_level, t.data_pclk_edge,
                         t.de_level, t.sync_pclk_edge);
@@ -4227,7 +4228,7 @@ static const struct dispc_errata_i734_data {
                 .hactive = 8, .vactive = 1,
                 .pixelclock = 16000000,
                 .hsync_len = 8, .hfront_porch = 4, .hback_porch = 4,
-                .vsync_len = 1, .vfp = 1, .vbp = 1,
+                .vsync_len = 1, .vfront_porch = 1, .vbp = 1,
                 .vsync_level = OMAPDSS_SIG_ACTIVE_LOW,
                 .hsync_level = OMAPDSS_SIG_ACTIVE_LOW,
                 .interlace = false,