From 5d0970aacbda2d1ff37a283dccb0721a4fee7282 Mon Sep 17 00:00:00 2001
From: Luo Wei <lw@rock-chips.com>
Date: Mon, 15 Jan 2024 18:25:14 +0800
Subject: [PATCH] mfd: display-serdes: fix compile errors on kernel-6.1

Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: Id52ed6fe9779cef2fe08c781cbe46f68b621844f
---
 drivers/mfd/display-serdes/core.h             |  6 +++++-
 .../mfd/display-serdes/serdes-bridge-split.c  | 21 +++----------------
 drivers/mfd/display-serdes/serdes-bridge.c    | 21 +++----------------
 drivers/mfd/display-serdes/serdes-panel.c     |  6 ++----
 4 files changed, 13 insertions(+), 41 deletions(-)

diff --git a/drivers/mfd/display-serdes/core.h b/drivers/mfd/display-serdes/core.h
index 8563ae5e7fac..941f448adcac 100644
--- a/drivers/mfd/display-serdes/core.h
+++ b/drivers/mfd/display-serdes/core.h
@@ -38,7 +38,7 @@
 #include <linux/gpio/consumer.h>
 #include <linux/extcon-provider.h>
 #include <linux/bitfield.h>
-
+#include <linux/version.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_bridge.h>
 #include <drm/drm_panel.h>
@@ -46,7 +46,11 @@
 #include <drm/drm_of.h>
 #include <drm/drm_connector.h>
 #include <drm/drm_probe_helper.h>
+#if (KERNEL_VERSION(6, 1, 0) <= LINUX_VERSION_CODE)
+#include <drm/display/drm_dp_helper.h>
+#else
 #include <drm/drm_dp_helper.h>
+#endif
 #include <drm/drm_device.h>
 #include <drm/drm_modes.h>
 #include <drm/drm_atomic_state_helper.h>
diff --git a/drivers/mfd/display-serdes/serdes-bridge-split.c b/drivers/mfd/display-serdes/serdes-bridge-split.c
index 38d94692a327..4bb47cbf3f73 100644
--- a/drivers/mfd/display-serdes/serdes-bridge-split.c
+++ b/drivers/mfd/display-serdes/serdes-bridge-split.c
@@ -43,24 +43,9 @@ static struct mipi_dsi_device *serdes_attach_dsi(struct serdes_bridge_split *ser
 
 	dsi->lanes = 4;
 	dsi->format = MIPI_DSI_FMT_RGB888;
-
-	if (serdes->chip_data->name) {
-		if ((!strcmp(serdes->chip_data->name, "bu18tl82")) ||
-		    (!strcmp(serdes->chip_data->name, "bu18rl82"))) {
-			dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
-					  MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET;
-			SERDES_DBG_MFD("%s: %s dsi_mode MIPI_DSI_MODE_VIDEO_BURST 0x%lx\n",
-				       __func__, serdes->chip_data->name, dsi->mode_flags);
-		} else {
-			dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
-			SERDES_DBG_MFD("%s: %s dsi_mode MIPI_DSI_MODE_VIDEO_SYNC_PULSE 0x%lx\n",
-			       __func__, serdes->chip_data->name, dsi->mode_flags);
-		}
-	} else {
-		dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
-		SERDES_DBG_MFD("%s: %s dsi_mode MIPI_DSI_MODE_VIDEO_SYNC_PULSE 0x%lx\n",
-			   __func__, serdes->chip_data->name, dsi->mode_flags);
-	}
+	dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
+	SERDES_DBG_MFD("%s: %s dsi_mode MIPI_DSI_MODE_VIDEO_SYNC_PULSE 0x%lx\n",
+		       __func__, serdes->chip_data->name, dsi->mode_flags);
 
 	ret = mipi_dsi_attach(dsi);
 	if (ret < 0) {
diff --git a/drivers/mfd/display-serdes/serdes-bridge.c b/drivers/mfd/display-serdes/serdes-bridge.c
index 6dc82a8640be..bcb7ade23031 100644
--- a/drivers/mfd/display-serdes/serdes-bridge.c
+++ b/drivers/mfd/display-serdes/serdes-bridge.c
@@ -43,24 +43,9 @@ static struct mipi_dsi_device *serdes_attach_dsi(struct serdes_bridge *serdes_br
 
 	dsi->lanes = 4;
 	dsi->format = MIPI_DSI_FMT_RGB888;
-
-	if (serdes->chip_data->name) {
-		if ((!strcmp(serdes->chip_data->name, "bu18tl82")) ||
-		    (!strcmp(serdes->chip_data->name, "bu18rl82"))) {
-			dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
-					  MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET;
-			SERDES_DBG_MFD("%s: %s dsi_mode MIPI_DSI_MODE_VIDEO_BURST 0x%lx\n",
-				       __func__, serdes->chip_data->name, dsi->mode_flags);
-		} else {
-			dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
-			SERDES_DBG_MFD("%s: %s dsi_mode MIPI_DSI_MODE_VIDEO_SYNC_PULSE 0x%lx\n",
-			       __func__, serdes->chip_data->name, dsi->mode_flags);
-		}
-	} else {
-		dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
-		SERDES_DBG_MFD("%s: %s dsi_mode MIPI_DSI_MODE_VIDEO_SYNC_PULSE 0x%lx\n",
-			   __func__, serdes->chip_data->name, dsi->mode_flags);
-	}
+	dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
+	SERDES_DBG_MFD("%s: %s dsi_mode MIPI_DSI_MODE_VIDEO_SYNC_PULSE 0x%lx\n",
+		       __func__, serdes->chip_data->name, dsi->mode_flags);
 
 	ret = mipi_dsi_attach(dsi);
 	if (ret < 0) {
diff --git a/drivers/mfd/display-serdes/serdes-panel.c b/drivers/mfd/display-serdes/serdes-panel.c
index 2793220cc691..e2abfc0ba641 100644
--- a/drivers/mfd/display-serdes/serdes-panel.c
+++ b/drivers/mfd/display-serdes/serdes-panel.c
@@ -153,8 +153,7 @@ static int serdes_panel_parse_dt(struct serdes_panel *serdes_panel)
 	if (of_find_property(dev->of_node, "panel-size", &len)) {
 		len /= sizeof(unsigned int);
 		if (len != 2) {
-			dev_err(dev, "panel-size length is error, set 2 default\n",
-				dev->of_node);
+			dev_err(dev, "panel-size length is error, set 2 default\n");
 			len = 2;
 		}
 		ret = of_property_read_u32_array(dev->of_node, "panel-size",
@@ -168,8 +167,7 @@ static int serdes_panel_parse_dt(struct serdes_panel *serdes_panel)
 	if (of_find_property(dev->of_node, "rate-count-ssc", &len)) {
 		len /= sizeof(unsigned int);
 		if (len != 3) {
-			dev_err(dev, "rate-count-ssc length is error, set 3 default\n",
-				dev->of_node);
+			dev_err(dev, "rate-count-ssc length is error, set 3 default\n");
 			len = 3;
 		}
 		ret = of_property_read_u32_array(dev->of_node, "rate-count-ssc",