diff --git a/config/gki_waipiodisptui.conf b/config/gki_waipiodisptui.conf
new file mode 100644
index 00000000..1625ce06
--- /dev/null
+++ b/config/gki_waipiodisptui.conf
@@ -0,0 +1,9 @@
+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_REGISTER_LOGGING=y
+export CONFIG_DISPLAY_BUILD=m
+export CONFIG_DRM_SDE_VM=y
diff --git a/config/gki_waipiodisptuiconf.h b/config/gki_waipiodisptuiconf.h
new file mode 100644
index 00000000..b89e564f
--- /dev/null
+++ b/config/gki_waipiodisptuiconf.h
@@ -0,0 +1,15 @@
+/* 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_MSM_REGISTER_LOGGING 1
+#define CONFIG_DRM_SDE_EVTLOG_DEBUG 1
+#define CONFIG_QCOM_MDSS_PLL 1
+#define CONFIG_GKI_DISPLAY 1
+#define CONFIG_DRM_SDE_VM 1
diff --git a/msm/Kbuild b/msm/Kbuild
index e8bd4f8c..ac52440b 100644
--- a/msm/Kbuild
+++ b/msm/Kbuild
@@ -3,9 +3,14 @@
 KDIR := $(TOP)/kernel_platform/common
 
 ifeq ($(CONFIG_ARCH_WAIPIO), y)
+ifeq ($(CONFIG_ARCH_QTI_VM), y)
+	include $(DISPLAY_ROOT)/config/gki_waipiodisptui.conf
+	LINUX_INC +=	-include $(DISPLAY_ROOT)/config/gki_waipiodisptuiconf.h
+else
 	include $(DISPLAY_ROOT)/config/gki_waipiodisp.conf
 	LINUX_INC +=	-include $(DISPLAY_ROOT)/config/gki_waipiodispconf.h
 endif
+endif
 
 KBUILD_CPPFLAGS += -DCONFIG_MSM_MMRM=1