From 7e0d611df2854b42c7db420bbbdd0d40e1120c6a Mon Sep 17 00:00:00 2001 From: Chris Goldsworthy Date: Mon, 13 Jun 2022 19:44:48 -0700 Subject: [PATCH 1/4] modules.list.msm.pineapple: Add our DMA-BUF heap module Add our DMA-BUF heap module to the list of first stage modules. Change-Id: Ie7aa305bad094c32e83c04ba58b360ccce75a7b6 Signed-off-by: Chris Goldsworthy --- modules.list.msm.pineapple | 1 + 1 file changed, 1 insertion(+) diff --git a/modules.list.msm.pineapple b/modules.list.msm.pineapple index 77c3b2d0be4c..e89b73e15729 100644 --- a/modules.list.msm.pineapple +++ b/modules.list.msm.pineapple @@ -4,6 +4,7 @@ qcom-pdc.ko qcom_iommu_util.ko arm_smmu.ko secure_buffer.ko +qcom_dma_heaps.ko mem_buf_dev.ko mem_buf_msgq.ko mem_buf.ko From c8f27e8aa7a5bc7a052f20959ab7ea211ffd85fb Mon Sep 17 00:00:00 2001 From: Chris Goldsworthy Date: Mon, 13 Jun 2022 19:43:40 -0700 Subject: [PATCH 2/4] defconfig: pineapple-gki: Enable our DMA-BUF heaps Enable our DMA-BUF heaps. Change-Id: I8cebaf90f6da5756d51da0dea1cd394ebc78f23a Signed-off-by: Chris Goldsworthy --- arch/arm64/configs/vendor/pineapple_GKI.config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/configs/vendor/pineapple_GKI.config b/arch/arm64/configs/vendor/pineapple_GKI.config index 3c37e1487bd8..d77a07f29683 100644 --- a/arch/arm64/configs/vendor/pineapple_GKI.config +++ b/arch/arm64/configs/vendor/pineapple_GKI.config @@ -19,6 +19,12 @@ CONFIG_PHY_QCOM_UFS_QRBTC_SDM845=m CONFIG_PINCTRL_MSM=m CONFIG_PINCTRL_PINEAPPLE=m CONFIG_QCOM_COMMAND_DB=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_SECURE=y CONFIG_QCOM_GDSC_REGULATOR=m CONFIG_QCOM_IOMMU_UTIL=m CONFIG_QCOM_MEM_BUF=m From 8f0693598e2a1a3c98dd7c7e986859f8c3930249 Mon Sep 17 00:00:00 2001 From: Chris Goldsworthy Date: Wed, 15 Jun 2022 18:30:17 -0700 Subject: [PATCH 3/4] modules.list.msm.pineapple: Add our lazy mapping module Add our lazy mapping to the list of first stage modules. Change-Id: I235a69a9e706e5a48be76a5feb636e08791bb0da Signed-off-by: Chris Goldsworthy --- modules.list.msm.pineapple | 1 + 1 file changed, 1 insertion(+) diff --git a/modules.list.msm.pineapple b/modules.list.msm.pineapple index e89b73e15729..ac01fa117449 100644 --- a/modules.list.msm.pineapple +++ b/modules.list.msm.pineapple @@ -5,6 +5,7 @@ qcom_iommu_util.ko arm_smmu.ko secure_buffer.ko qcom_dma_heaps.ko +msm_dma_iommu_mapping.ko mem_buf_dev.ko mem_buf_msgq.ko mem_buf.ko From 7e4cc66980a32ae45d848c3b473ecb4334a430c0 Mon Sep 17 00:00:00 2001 From: Chris Goldsworthy Date: Wed, 15 Jun 2022 18:26:13 -0700 Subject: [PATCH 4/4] defconfig: pineapple-gki: Enable our lazy mapping module Enable our lazy mapping module on pineapple. Change-Id: I83d9bbdba4751792cfd86f542001f35c82a7f1c8 Signed-off-by: Chris Goldsworthy --- arch/arm64/configs/vendor/pineapple_GKI.config | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/vendor/pineapple_GKI.config b/arch/arm64/configs/vendor/pineapple_GKI.config index d77a07f29683..5db0f99dc717 100644 --- a/arch/arm64/configs/vendor/pineapple_GKI.config +++ b/arch/arm64/configs/vendor/pineapple_GKI.config @@ -27,6 +27,7 @@ CONFIG_QCOM_DMABUF_HEAPS_SYSTEM=y CONFIG_QCOM_DMABUF_HEAPS_SYSTEM_SECURE=y CONFIG_QCOM_GDSC_REGULATOR=m CONFIG_QCOM_IOMMU_UTIL=m +CONFIG_QCOM_LAZY_MAPPING=m CONFIG_QCOM_MEM_BUF=m CONFIG_QCOM_MEM_BUF_DEV=m # CONFIG_QCOM_MINIDUMP is not set