diff --git a/arch/arm64/configs/vendor/gen3auto_GKI.config b/arch/arm64/configs/vendor/gen3auto_GKI.config
index 288e82eeb527..8eacaab9e35b 100644
--- a/arch/arm64/configs/vendor/gen3auto_GKI.config
+++ b/arch/arm64/configs/vendor/gen3auto_GKI.config
@@ -23,6 +23,7 @@ CONFIG_KERNEL_HEADER_TEST=y
 CONFIG_UAPI_HEADER_TEST=y
 CONFIG_QCOM_PDC=m
 CONFIG_QCOM_RPMH=m
+CONFIG_QTI_IOMMU_SUPPORT=m
 CONFIG_QCOM_COMMAND_DB=m
 CONFIG_QCOM_RPMH=m
 CONFIG_INTERCONNECT_QCOM=m
diff --git a/arch/arm64/configs/vendor/gen3auto_QGKI.config b/arch/arm64/configs/vendor/gen3auto_QGKI.config
index 9e36755964ba..0bdaaf0ca4c6 100644
--- a/arch/arm64/configs/vendor/gen3auto_QGKI.config
+++ b/arch/arm64/configs/vendor/gen3auto_QGKI.config
@@ -4,6 +4,9 @@ CONFIG_DEBUG_FS=y
 # CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_REGULATOR_QTI_DEBUG=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_DETECT_HUNG_TASK is not set
 # CONFIG_ZONE_DMA32 is not set
 # CONFIG_SOFTLOCKUP_DETECTOR is not set
diff --git a/arch/arm64/configs/vendor/gen3auto_debug.config b/arch/arm64/configs/vendor/gen3auto_debug.config
index aab4a6a8c22a..5ad1d61945d1 100644
--- a/arch/arm64/configs/vendor/gen3auto_debug.config
+++ b/arch/arm64/configs/vendor/gen3auto_debug.config
@@ -1,6 +1,8 @@
 CONFIG_LOCALVERSION="-qgki-debug"
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEBUG_SPINLOCK=y
+CONFIG_IOMMU_DEBUG=y
+CONFIG_IOMMU_TESTS=y
 CONFIG_LKDTM=m
 CONFIG_ATOMIC64_SELFTEST=m
 CONFIG_RCU_TORTURE_TEST=m