diff --git a/arch/arm64/configs/vendor/blair_GKI.config b/arch/arm64/configs/vendor/blair_GKI.config
index ec45866703cf..b42a66dee0d9 100644
--- a/arch/arm64/configs/vendor/blair_GKI.config
+++ b/arch/arm64/configs/vendor/blair_GKI.config
@@ -26,6 +26,7 @@ CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MSM_BOOT_STATS=m
 CONFIG_MSM_CORE_HANG_DETECT=m
 CONFIG_MSM_GPI_DMA=m
+# CONFIG_MSM_HAB is not set
 CONFIG_MSM_HSUSB_PHY=m
 CONFIG_MSM_PERFORMANCE=m
 CONFIG_MSM_QMP=m
@@ -46,12 +47,23 @@ CONFIG_QCOM_CDSP_RM=m
 CONFIG_QCOM_CLK_RPMH=m
 CONFIG_QCOM_COMMAND_DB=m
 CONFIG_QCOM_DCC_V2=m
+CONFIG_QCOM_DMABUF_HEAPS=m
+CONFIG_QCOM_DMABUF_HEAPS_CARVEOUT=y
+CONFIG_QCOM_DMABUF_HEAPS_CMA=y
+CONFIG_QCOM_DMABUF_HEAPS_PAGE_POOL_REFILL=y
+CONFIG_QCOM_DMABUF_HEAPS_SYSTEM=y
+# CONFIG_QCOM_DMABUF_HEAPS_SYSTEM_MOVABLE is not set
+CONFIG_QCOM_DMABUF_HEAPS_SYSTEM_SECURE=y
+CONFIG_QCOM_DMABUF_HEAPS_SYSTEM_UNCACHED=y
+# CONFIG_QCOM_DMABUF_HEAPS_TUI_CARVEOUT is not set
+# CONFIG_QCOM_DMABUF_HEAPS_UBWCP is not set
 CONFIG_QCOM_EUD=m
 CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
 CONFIG_QCOM_GLINK_PKT=m
 CONFIG_QCOM_IOMMU_DEBUG=m
 CONFIG_QCOM_IOMMU_UTIL=m
 CONFIG_QCOM_IPCC=m
+CONFIG_QCOM_LAZY_MAPPING=m
 CONFIG_QCOM_LLCC_PMU=m
 CONFIG_QCOM_MEMORY_DUMP_V2=m
 CONFIG_QCOM_MEM_BUF=m
diff --git a/blair.bzl b/blair.bzl
index ee26baafc04a..cdb5c7af8838 100644
--- a/blair.bzl
+++ b/blair.bzl
@@ -14,6 +14,7 @@ def define_blair():
         "drivers/clk/qcom/clk-spmi-pmic-div.ko",
         "drivers/cpufreq/qcom-cpufreq-hw.ko",
         "drivers/cpufreq/qcom-cpufreq-hw-debug.ko",
+        "drivers/dma-buf/heaps/qcom_dma_heaps.ko",
         "drivers/dma/qcom/msm_gpi.ko",
         "drivers/edac/kryo_arm64_edac.ko",
         "drivers/firmware/qcom-scm.ko",
@@ -26,6 +27,7 @@ def define_blair():
         "drivers/interconnect/icc-test.ko",
         "drivers/iommu/arm/arm-smmu/arm_smmu.ko",
         "drivers/iommu/iommu-logger.ko",
+        "drivers/iommu/msm_dma_iommu_mapping.ko",
         "drivers/iommu/qcom_iommu_debug.ko",
         "drivers/iommu/qcom_iommu_util.ko",
         "drivers/irqchip/irq-qcom-mpm.ko",