diff --git a/arch/arm64/configs/vendor/direwolf_auto_GKI.config b/arch/arm64/configs/vendor/direwolf_auto_GKI.config
index 8f8bf254740f..3af1ffdeedef 100644
--- a/arch/arm64/configs/vendor/direwolf_auto_GKI.config
+++ b/arch/arm64/configs/vendor/direwolf_auto_GKI.config
@@ -28,3 +28,11 @@ CONFIG_RTC_DRV_PM8XXX=m
 CONFIG_SPMI_PMIC_CLKDIV=m
 CONFIG_QCOM_SPMI_ADC5=m
 CONFIG_NVMEM_SPMI_SDAM=m
+CONFIG_ION_MSM_HEAPS=m
+CONFIG_QTI_IOMMU_SUPPORT=m
+CONFIG_PINCTRL_SLPI=m
+CONFIG_QCOM_WDT_CORE=m
+CONFIG_QCOM_SOC_WATCHDOG=m
+CONFIG_POWER_RESET_MSM=m
+CONFIG_QCOM_MEMORY_DUMP_V2=m
+CONFIG_QCOM_SCM=m
diff --git a/arch/arm64/configs/vendor/direwolf_auto_QGKI.config b/arch/arm64/configs/vendor/direwolf_auto_QGKI.config
index 4ce12a08bf08..73a604c712fb 100644
--- a/arch/arm64/configs/vendor/direwolf_auto_QGKI.config
+++ b/arch/arm64/configs/vendor/direwolf_auto_QGKI.config
@@ -5,3 +5,8 @@ CONFIG_REGULATOR_QTI_DEBUG=y
 CONFIG_SA_DEBUGCC_DIREWOLF=y
 CONFIG_ARM_QCOM_CPUFREQ_HW_DEBUG=y
 CONFIG_INTERCONNECT_TEST=y
+CONFIG_ION_POOL_AUTO_REFILL=y
+CONFIG_QCOM_IOMMU_IO_PGTABLE_QUIRKS=y
+CONFIG_IOMMU_IO_PGTABLE_FAST=y
+CONFIG_QCOM_LAZY_MAPPING=y
+CONFIG_QCOM_MINIDUMP=y
diff --git a/arch/arm64/configs/vendor/direwolf_auto_debug.config b/arch/arm64/configs/vendor/direwolf_auto_debug.config
index 9195e6d30432..75ef3de48f0b 100644
--- a/arch/arm64/configs/vendor/direwolf_auto_debug.config
+++ b/arch/arm64/configs/vendor/direwolf_auto_debug.config
@@ -1 +1,3 @@
 CONFIG_LOCALVERSION="-qgki-debug"
+CONFIG_IOMMU_DEBUG=y
+CONFIG_IOMMU_TESTS=y