diff --git a/arch/arm64/configs/vendor/autogvm.config b/arch/arm64/configs/vendor/autogvm.config
index 9f8f1a718d88..392ab9bebe22 100644
--- a/arch/arm64/configs/vendor/autogvm.config
+++ b/arch/arm64/configs/vendor/autogvm.config
@@ -105,7 +105,7 @@ CONFIG_QTI_IOMMU_SUPPORT=y
 CONFIG_QTI_QUIN_GVM=y
 CONFIG_REGULATOR_STUB=y
 CONFIG_RPMSG_QCOM_GLINK=y
-CONFIG_RPMSG_QCOM_GLINK_CMA=y
+CONFIG_RPMSG_QCOM_GLINK_CMA=m
 CONFIG_RPMSG_QCOM_GLINK_SMEM=y
 CONFIG_SCSI_UFSHCD=y
 CONFIG_SCSI_UFS_BSG=y
diff --git a/autogvm_lxc.bzl b/autogvm_lxc.bzl
index 58399135aac2..5cbd2ac6b8bf 100644
--- a/autogvm_lxc.bzl
+++ b/autogvm_lxc.bzl
@@ -7,6 +7,7 @@ target_name = "autogvm"
 def define_autogvm_lxc():
     _autogvm_lxc_in_tree_modules = [
         # keep sorted
+        "drivers/rpmsg/qcom_glink_cma.ko",
         "drivers/soc/qcom/hgsl/qcom_hgsl.ko",
     ]