diff --git a/config/gki_waipiodisp.conf b/config/gki_waipiodisp.conf
new file mode 100644
index 0000000000..a66978352d
--- /dev/null
+++ b/config/gki_waipiodisp.conf
@@ -0,0 +1,12 @@
+export CONFIG_DRM_MSM=y
+export CONFIG_DRM_MSM_SDE=y
+export CONFIG_SYNC_FILE=y
+export CONFIG_DRM_MSM_DSI=y
+export CONFIG_DSI_PARSER=y
+export CONFIG_QCOM_MDSS_PLL=y
+export CONFIG_DRM_MSM_DP=y
+export CONFIG_DRM_MSM_DP_MST=y
+export CONFIG_DRM_SDE_RSC=y
+export CONFIG_DRM_SDE_WB=y
+export CONFIG_DRM_MSM_REGISTER_LOGGING=y
+export CONFIG_DISPLAY_BUILD=m
diff --git a/config/gki_waipiodispconf.h b/config/gki_waipiodispconf.h
new file mode 100644
index 0000000000..952c0072bb
--- /dev/null
+++ b/config/gki_waipiodispconf.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2021, The Linux Foundation. All rights reserved.
+ */
+
+#define CONFIG_DRM_MSM 1
+#define CONFIG_DRM_MSM_SDE 1
+#define CONFIG_SYNC_FILE 1
+#define CONFIG_DRM_MSM_DSI 1
+#define CONFIG_DSI_PARSER 1
+#define CONFIG_DRM_SDE_WB 1
+#define CONFIG_DRM_MSM_DP 1
+#define CONFIG_DRM_MSM_DP_MST 1
+#define CONFIG_DRM_SDE_RSC 1
+#define CONFIG_DRM_MSM_REGISTER_LOGGING 1
+#define CONFIG_DRM_SDE_EVTLOG_DEBUG 1
+#define CONFIG_QCOM_MDSS_PLL 1
+#define CONFIG_GKI_DISPLAY 1
+
diff --git a/msm/Android.mk b/msm/Android.mk
index 8d186d2bce..753447660a 100644
--- a/msm/Android.mk
+++ b/msm/Android.mk
@@ -25,11 +25,12 @@ KBUILD_OPTIONS += $(DISPLAY_SELECT)
 
 ###########################################################
 include $(CLEAR_VARS)
+LOCAL_SRC_FILES   := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
 LOCAL_MODULE              := msm_drm.ko
 LOCAL_MODULE_KBUILD_NAME  := msm_drm.ko
 LOCAL_MODULE_TAGS         := optional
 LOCAL_MODULE_DEBUG_ENABLE := true
 LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
-include $(DLKM_DIR)/AndroidKernelModule.mk
+include $(DLKM_DIR)/Build_external_kernelmodule.mk
 ###########################################################
 endif # DLKM check
diff --git a/msm/Kbuild b/msm/Kbuild
index 330347f6b8..1fbc6b5d57 100644
--- a/msm/Kbuild
+++ b/msm/Kbuild
@@ -2,6 +2,11 @@
 
 KDIR := $(TOP)/kernel_platform/common
 
+ifeq ($(CONFIG_ARCH_WAIPIO), y)
+	include $(DISPLAY_ROOT)/config/gki_waipiodisp.conf
+	LINUX_INC +=	-include $(DISPLAY_ROOT)/config/gki_waipiodispconf.h
+endif
+
 LINUX_INC +=	-Iinclude/linux \
 		-Iinclude/linux/drm
 
@@ -104,9 +109,7 @@ msm_drm-$(CONFIG_DRM_MSM_DP_MST) += dp/dp_mst_drm.o
 
 msm_drm-$(CONFIG_DRM_MSM_DP_USBPD_LEGACY) += dp/dp_usbpd.o
 
-msm_drm-$(CONFIG_DRM_MSM_SDE) += sde/sde_vm_trusted.o \
-				 sde/sde_vm_msgq.o \
-				 sde/sde_crtc.o \
+msm_drm-$(CONFIG_DRM_MSM_SDE) += sde/sde_crtc.o \
 				 sde/sde_encoder.o \
 				 sde/sde_encoder_dce.o \
 				 sde/sde_encoder_phys_vid.o \