aa5ab7f
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
aa5ab7f
From: Peter Robinson <pbrobinson@gmail.com>
aa5ab7f
Date: Sun, 12 Jul 2020 13:42:04 +0100
aa5ab7f
Subject: [PATCH] Revert "drm/sun4i: sun6i_mipi_dsi: fix horizontal timing
aa5ab7f
 calculation"
aa5ab7f
aa5ab7f
This reverts commit d20a2ac9c6ecf514e115f06b6744b584bbc7c1b8.
aa5ab7f
---
aa5ab7f
 drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 10 +++++-----
aa5ab7f
 1 file changed, 5 insertions(+), 5 deletions(-)
aa5ab7f
aa5ab7f
diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
aa5ab7f
index 52e009dc632b..aa67cb037e9d 100644
aa5ab7f
--- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
aa5ab7f
+++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
aa5ab7f
@@ -556,7 +556,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
aa5ab7f
 		 */
aa5ab7f
 #define HSA_PACKET_OVERHEAD	10
aa5ab7f
 		hsa = max((unsigned int)HSA_PACKET_OVERHEAD,
aa5ab7f
-			  (mode->hsync_end - mode->hsync_start) * Bpp) - HSA_PACKET_OVERHEAD;
aa5ab7f
+			  (mode->hsync_end - mode->hsync_start) * Bpp - HSA_PACKET_OVERHEAD);
aa5ab7f
aa5ab7f
 		/*
aa5ab7f
 		 * The backporch is set using a blanking packet (4
aa5ab7f
@@ -565,7 +565,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
aa5ab7f
 		 */
aa5ab7f
 #define HBP_PACKET_OVERHEAD	6
aa5ab7f
 		hbp = max((unsigned int)HBP_PACKET_OVERHEAD,
aa5ab7f
-			  (mode->htotal - mode->hsync_end) * Bpp) - HBP_PACKET_OVERHEAD;
aa5ab7f
+			  (mode->htotal - mode->hsync_end) * Bpp - HBP_PACKET_OVERHEAD);
aa5ab7f
aa5ab7f
 		/*
aa5ab7f
 		 * The frontporch is set using a sync event (4 bytes)
aa5ab7f
@@ -575,7 +575,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
aa5ab7f
 		 */
aa5ab7f
 #define HFP_PACKET_OVERHEAD	16
aa5ab7f
 		hfp = max((unsigned int)HFP_PACKET_OVERHEAD,
aa5ab7f
-			  (mode->hsync_start - mode->hdisplay) * Bpp) - HFP_PACKET_OVERHEAD;
aa5ab7f
+			  (mode->hsync_start - mode->hdisplay) * Bpp - HFP_PACKET_OVERHEAD);
aa5ab7f
aa5ab7f
 		/*
aa5ab7f
 		 * The blanking is set using a sync event (4 bytes)
aa5ab7f
@@ -584,8 +584,8 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
aa5ab7f
 		 */
aa5ab7f
 #define HBLK_PACKET_OVERHEAD	10
aa5ab7f
 		hblk = max((unsigned int)HBLK_PACKET_OVERHEAD,
aa5ab7f
-			   (mode->htotal - (mode->hsync_end - mode->hsync_start)) * Bpp) -
aa5ab7f
-			   HBLK_PACKET_OVERHEAD;
aa5ab7f
+			   (mode->htotal - (mode->hsync_end - mode->hsync_start)) * Bpp -
aa5ab7f
+			   HBLK_PACKET_OVERHEAD);
aa5ab7f
aa5ab7f
 		/*
aa5ab7f
 		 * And I'm not entirely sure what vblk is about. The driver in
aa5ab7f
-- 
aa5ab7f
2.26.2
aa5ab7f