diff --git a/Makefile b/Makefile
index 55b24b1db8..dff2b9ee67 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,16 @@ LINUXINCLUDE    += -include $(srctree)/techpack/display/config/gki_lahainadispco
 endif
 endif
 
+ifeq ($(CONFIG_ARCH_HOLI), y)
+     ifeq ($(CONFIG_QGKI), y)
+		include $(srctree)/techpack/display/config/holidisp.conf
+LINUXINCLUDE    += -include $(srctree)/techpack/display/config/holidispconf.h
+     else
+		include $(srctree)/techpack/display/config/gki_holidisp.conf
+LINUXINCLUDE    += -include $(srctree)/techpack/display/config/gki_holidispconf.h
+     endif
+endif
+
 LINUXINCLUDE    += \
 		   -I$(srctree)/techpack/display/include/uapi/display \
 		   -I$(srctree)/techpack/display/include
diff --git a/config/gki_holidisp.conf b/config/gki_holidisp.conf
new file mode 100644
index 0000000000..6df5fa7e71
--- /dev/null
+++ b/config/gki_holidisp.conf
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (c) 2020, The Linux Foundation. All rights reserved.
+
+export CONFIG_DRM_MSM=y
+export CONFIG_DRM_MSM_SDE=y
+export CONFIG_DRM_MSM_DP=n
+export CONFIG_DRM_MSM_DP_MST=n
+export CONFIG_SYNC_FILE=y
+export CONFIG_DRM_MSM_DSI=y
+export CONFIG_DSI_PARSER=y
+export CONFIG_DRM_SDE_WB=n
+export CONFIG_DRM_MSM_REGISTER_LOGGING=y
+export CONFIG_QCOM_MDSS_PLL=y
+export CONFIG_DRM_SDE_RSC=n
+export CONFIG_DISPLAY_BUILD=m
diff --git a/config/gki_holidispconf.h b/config/gki_holidispconf.h
new file mode 100644
index 0000000000..378d3216bb
--- /dev/null
+++ b/config/gki_holidispconf.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2020, 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
diff --git a/config/holidisp.conf b/config/holidisp.conf
new file mode 100644
index 0000000000..5f9b203a69
--- /dev/null
+++ b/config/holidisp.conf
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (c) 2020, The Linux Foundation. All rights reserved.
+
+export CONFIG_DRM_MSM=y
+export CONFIG_DRM_MSM_SDE=y
+export CONFIG_DRM_MSM_DP=n
+export CONFIG_DRM_MSM_DP_MST=n
+export CONFIG_SYNC_FILE=y
+export CONFIG_DRM_MSM_DSI=y
+export CONFIG_DSI_PARSER=y
+export CONFIG_DRM_SDE_WB=n
+export CONFIG_DRM_MSM_REGISTER_LOGGING=y
+export CONFIG_QCOM_MDSS_PLL=y
+export CONFIG_DRM_SDE_RSC=n
+export CONFIG_DISPLAY_BUILD=y
diff --git a/config/holidispconf.h b/config/holidispconf.h
new file mode 100644
index 0000000000..05400274c4
--- /dev/null
+++ b/config/holidispconf.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2020, 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