1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index 074410371e2..656b2e3334a 100644
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -102,12 +102,12 @@ static int tegra_dc_set_timings(struct tegra_dc *dc,
                 ((mode->hsync_end - mode->hsync_start) <<  0);
         tegra_dc_writel(dc, value, DC_DISP_SYNC_WIDTH);
 
-        value = ((mode->vsync_start - mode->vdisplay) << 16) |
-                ((mode->hsync_start - mode->hdisplay) <<  0);
-        tegra_dc_writel(dc, value, DC_DISP_BACK_PORCH);
-
         value = ((mode->vtotal - mode->vsync_end) << 16) |
                 ((mode->htotal - mode->hsync_end) <<  0);
+        tegra_dc_writel(dc, value, DC_DISP_BACK_PORCH);
+
+        value = ((mode->vsync_start - mode->vdisplay) << 16) |
+                ((mode->hsync_start - mode->hdisplay) <<  0);
         tegra_dc_writel(dc, value, DC_DISP_FRONT_PORCH);
 
         value = (mode->vdisplay << 16) | mode->hdisplay;
@@ -221,8 +221,7 @@ static int tegra_crtc_mode_set(struct drm_crtc *crtc,
         win.stride = crtc->fb->pitches[0];
 
         /* program window registers */
-        value = tegra_dc_readl(dc, DC_CMD_DISPLAY_WINDOW_HEADER);
-        value |= WINDOW_A_SELECT;
+        value = WINDOW_A_SELECT;
         tegra_dc_writel(dc, value, DC_CMD_DISPLAY_WINDOW_HEADER);
 
         tegra_dc_writel(dc, win.fmt, DC_WIN_COLOR_DEPTH);