From 669557d6ebe75888bccb53ac5c3cb7e80e55357f Mon Sep 17 00:00:00 2001
From: Jayaprakash <jmadiset@codeaurora.org>
Date: Wed, 11 Sep 2019 23:41:29 +0530
Subject: [PATCH] disp: msm: add changes for bengal target compilation

This change corrects the definitions of functions
invoked when their config keys are not enabled.

Change-Id: Iba4631b8019a5e5a6b95516c5c9f9e28942e60c9
Signed-off-by: Jayaprakash <jmadiset@codeaurora.org>
---
 msm/dp/dp_drm.h  | 13 +++++++++++++
 msm/msm_drv.c    | 12 ------------
 msm/sde/sde_wb.h | 23 +++++++++++++++++++----
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/msm/dp/dp_drm.h b/msm/dp/dp_drm.h
index 0056857ff7b3a..07f606e8a70bf 100644
--- a/msm/dp/dp_drm.h
+++ b/msm/dp/dp_drm.h
@@ -184,6 +184,19 @@ static inline int dp_connector_config_hdr(struct drm_connector *connector,
 	return 0;
 }
 
+int dp_connector_atomic_check(struct drm_connector *connector,
+	void *display,
+	struct drm_connector_state *c_state)
+{
+	return 0;
+}
+
+int dp_connector_set_colorspace(struct drm_connector *connector,
+	void *display)
+{
+	return 0;
+}
+
 static inline int dp_connector_post_init(struct drm_connector *connector,
 		void *display)
 {
diff --git a/msm/msm_drv.c b/msm/msm_drv.c
index e6529d16cb7f0..a3161e63c0425 100644
--- a/msm/msm_drv.c
+++ b/msm/msm_drv.c
@@ -2024,16 +2024,6 @@ static struct platform_driver msm_platform_driver = {
 	},
 };
 
-#ifdef CONFIG_QCOM_KGSL
-void __init adreno_register(void)
-{
-}
-
-void __exit adreno_unregister(void)
-{
-}
-#endif
-
 static int __init msm_drm_register(void)
 {
 	if (!modeset)
@@ -2044,7 +2034,6 @@ static int __init msm_drm_register(void)
 	msm_dsi_register();
 	msm_edp_register();
 	msm_hdmi_register();
-	adreno_register();
 	return platform_driver_register(&msm_platform_driver);
 }
 
@@ -2053,7 +2042,6 @@ static void __exit msm_drm_unregister(void)
 	DBG("fini");
 	platform_driver_unregister(&msm_platform_driver);
 	msm_hdmi_unregister();
-	adreno_unregister();
 	msm_edp_unregister();
 	msm_dsi_unregister();
 	msm_smmu_driver_cleanup();
diff --git a/msm/sde/sde_wb.h b/msm/sde/sde_wb.h
index a27aa28752b80..51f63d955c306 100644
--- a/msm/sde/sde_wb.h
+++ b/msm/sde/sde_wb.h
@@ -288,9 +288,7 @@ int sde_wb_config(struct drm_device *drm_dev, void *data,
 }
 static inline
 int sde_wb_connector_post_init(struct drm_connector *connector,
-		void *info,
-		void *display,
-		struct msm_mode_info *mode_info)
+					 void *display)
 {
 	return 0;
 }
@@ -318,7 +316,8 @@ int sde_wb_connector_set_property(struct drm_connector *connector,
 	return 0;
 }
 static inline
-int sde_wb_get_info(struct msm_display_info *info, void *display)
+int sde_wb_get_info(struct drm_connector *connector,
+		struct msm_display_info *info, void *display)
 {
 	return 0;
 }
@@ -341,7 +340,23 @@ int sde_wb_connector_state_get_output_roi(struct drm_connector_state *state,
 {
 	return 0;
 }
+static inline
+int sde_wb_connector_set_info_blob(struct drm_connector *connector,
+		void *info,
+		void *display,
+		struct msm_mode_info *mode_info)
+{
+	return 0;
+}
 
+static inline
+int sde_wb_get_mode_info(struct drm_connector *connector,
+		const struct drm_display_mode *drm_mode,
+		struct msm_mode_info *mode_info,
+		void *display, const struct msm_resource_caps_info *avail_res)
+{
+	return 0;
+}
 #endif
 #endif /* __SDE_WB_H__ */