From: Herton R. Krzesinski <herton(a)redhat.com>
Revert "drm/sun4i: sun6i_mipi_dsi: fix horizontal timing calculation"
This reverts commit 6c14763b1ce98698949ff45135c15e333aa6416d.
This commit was part of "[PATCH v2 0/5] Add support for PinePhone LCD panel",
which seems was sent to linux-arm-kernel (I can't see the original archive
though on
http://lists.infradead.org/pipermail/linux-arm-kernel/, but searching
I found it eg. here:
https://www.spinics.net/lists/arm-kernel/msg793244.html).
However, seems it was dropped on later v3 versions of the patchset. Looking
here:
https://patchwork.freedesktop.org/series/79025/, when you go to the
"Changes in v3:" note, we can see:
"- Dropped the "DSI fix" patch (the driver seems to work for me without
it)"
The patchset that was merged are in those upstream commit ranges:
5f5df8b4253f12dbc0b9e328b3334ce28c16fc08^..c8a753484066a6382d2539d3dca1428164a682bf
a6a22f82c90dab8966fc07bd7e798a0680803995^..60f2de5ffbf0ed7c0d9789bcc196884427e8cff5
This patch didn't go upstream and doesn't seem to be needed. Drop this from the
ARK tree.
Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com>
diff a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
--- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
+++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
@@ -556,7 +556,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
*/
#define HSA_PACKET_OVERHEAD 10
hsa = max((unsigned int)HSA_PACKET_OVERHEAD,
- (mode->hsync_end - mode->hsync_start) * Bpp) - HSA_PACKET_OVERHEAD;
+ (mode->hsync_end - mode->hsync_start) * Bpp - HSA_PACKET_OVERHEAD);
/*
* The backporch is set using a blanking packet (4
@@ -565,7 +565,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
*/
#define HBP_PACKET_OVERHEAD 6
hbp = max((unsigned int)HBP_PACKET_OVERHEAD,
- (mode->htotal - mode->hsync_end) * Bpp) - HBP_PACKET_OVERHEAD;
+ (mode->htotal - mode->hsync_end) * Bpp - HBP_PACKET_OVERHEAD);
/*
* The frontporch is set using a sync event (4 bytes)
@@ -575,7 +575,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
*/
#define HFP_PACKET_OVERHEAD 16
hfp = max((unsigned int)HFP_PACKET_OVERHEAD,
- (mode->hsync_start - mode->hdisplay) * Bpp) - HFP_PACKET_OVERHEAD;
+ (mode->hsync_start - mode->hdisplay) * Bpp - HFP_PACKET_OVERHEAD);
/*
* The blanking is set using a sync event (4 bytes)
@@ -584,8 +584,8 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
*/
#define HBLK_PACKET_OVERHEAD 10
hblk = max((unsigned int)HBLK_PACKET_OVERHEAD,
- (mode->htotal - (mode->hsync_end - mode->hsync_start)) * Bpp) -
- HBLK_PACKET_OVERHEAD;
+ (mode->htotal - (mode->hsync_end - mode->hsync_start)) * Bpp -
+ HBLK_PACKET_OVERHEAD);
/*
* And I'm not entirely sure what vblk is about. The driver in
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/925