Patch "Revert "drm/sun4i: dsi: Change the start delay calculation"" has been added to the 5.4-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    Revert "drm/sun4i: dsi: Change the start delay calculation"

to the 5.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     revert-drm-sun4i-dsi-change-the-start-delay-calculat.patch
and it can be found in the queue-5.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit eb14ebef6b9913bfaa5c173dc24b4283526f1adf
Author: Icenowy Zheng <icenowy@xxxxxxx>
Date:   Tue Oct 1 16:02:51 2019 +0800

    Revert "drm/sun4i: dsi: Change the start delay calculation"
    
    [ Upstream commit a00d17e0a71ae2e4fdaac46e1c12785d3346c3f2 ]
    
    This reverts commit da676c6aa6413d59ab0a80c97bbc273025e640b2.
    
    The original commit adds a start parameter to the calculation of the
    start delay according to some old BSP versions from Allwinner. However,
    there're two ways to add this delay -- add it in DSI controller or add
    it in the TCON. Add it in both controllers won't work.
    
    The code before this commit is picked from new versions of BSP kernel,
    which has a comment for the 1 that says "put start_delay to tcon". By
    checking the sun4i_tcon0_mode_set_cpu() in sun4i_tcon driver, it has
    already added this delay, so we shouldn't repeat to add the delay in DSI
    controller, otherwise the timing won't match.
    
    Signed-off-by: Icenowy Zheng <icenowy@xxxxxxx>
    Reviewed-by: Jagan Teki <jagan@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Maxime Ripard <mripard@xxxxxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20191001080253.6135-2-icenowy@xxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
index f2b288037b909..a18efd3055199 100644
--- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
+++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
@@ -365,8 +365,7 @@ static void sun6i_dsi_inst_init(struct sun6i_dsi *dsi,
 static u16 sun6i_dsi_get_video_start_delay(struct sun6i_dsi *dsi,
 					   struct drm_display_mode *mode)
 {
-	u16 start = clamp(mode->vtotal - mode->vdisplay - 10, 8, 100);
-	u16 delay = mode->vtotal - (mode->vsync_end - mode->vdisplay) + start;
+	u16 delay = mode->vtotal - (mode->vsync_end - mode->vdisplay) + 1;
 
 	if (delay > mode->vtotal)
 		delay = delay % mode->vtotal;