diff --git a/arch/arm64/configs/vendor/direwolf_auto_GKI.config b/arch/arm64/configs/vendor/direwolf_auto_GKI.config
index d338116e958e..b6a0e56b5210 100644
--- a/arch/arm64/configs/vendor/direwolf_auto_GKI.config
+++ b/arch/arm64/configs/vendor/direwolf_auto_GKI.config
@@ -29,3 +29,4 @@ 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
diff --git a/arch/arm64/configs/vendor/direwolf_auto_QGKI.config b/arch/arm64/configs/vendor/direwolf_auto_QGKI.config
index 18b37006ac29..fc9357e4e00f 100644
--- a/arch/arm64/configs/vendor/direwolf_auto_QGKI.config
+++ b/arch/arm64/configs/vendor/direwolf_auto_QGKI.config
@@ -6,3 +6,6 @@ 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
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