From 126c2fc1912e0304e2a1d37815794b2b5857bcd7 Mon Sep 17 00:00:00 2001 From: Hridya Valsaraju Date: Wed, 31 Mar 2021 10:26:53 -0700 Subject: [PATCH] ANDROID: dma-heap: Make the page-pool/deferred-free libraries built-in Since vendors might depend on them for their system heap implementations, make the page-pool/deferred-free libraries built-in to freeze their KMI. Bug: 183902174 Change-Id: If633619ec1f78d0fbd73c43c48b19d98db7807af Signed-off-by: Hridya Valsaraju --- arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 2 ++ drivers/dma-buf/heaps/Kconfig | 16 +++++++++------- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 4adc0b2ef8f7..1112c1e2e8d1 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -485,6 +485,8 @@ CONFIG_RTC_DRV_PL030=y CONFIG_RTC_DRV_PL031=y CONFIG_DMABUF_HEAPS=y CONFIG_DMABUF_SYSFS_STATS=y +CONFIG_DMABUF_HEAPS_DEFERRED_FREE=y +CONFIG_DMABUF_HEAPS_PAGE_POOL=y CONFIG_UIO=y CONFIG_VHOST_VSOCK=y CONFIG_STAGING=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 32f802569113..ac0290e18e68 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -439,6 +439,8 @@ CONFIG_EDAC=y CONFIG_RTC_CLASS=y CONFIG_DMABUF_HEAPS=y CONFIG_DMABUF_SYSFS_STATS=y +CONFIG_DMABUF_HEAPS_DEFERRED_FREE=y +CONFIG_DMABUF_HEAPS_PAGE_POOL=y CONFIG_UIO=y CONFIG_VHOST_VSOCK=y CONFIG_STAGING=y diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig index 7eecaf07684a..ff52efa83f39 100644 --- a/drivers/dma-buf/heaps/Kconfig +++ b/drivers/dma-buf/heaps/Kconfig @@ -1,14 +1,16 @@ -config DMABUF_HEAPS_DEFERRED_FREE - tristate +menuconfig DMABUF_HEAPS_DEFERRED_FREE + bool "DMA-BUF heaps deferred-free library" + help + Choose this option to enable the DMA-BUF heaps deferred-free library. -config DMABUF_HEAPS_PAGE_POOL - tristate +menuconfig DMABUF_HEAPS_PAGE_POOL + bool "DMA-BUF heaps page-pool library" + help + Choose this option to enable the DMA-BUF heaps page-pool library. config DMABUF_HEAPS_SYSTEM tristate "DMA-BUF System Heap" - depends on DMABUF_HEAPS - select DMABUF_HEAPS_PAGE_POOL - select DMABUF_HEAPS_DEFERRED_FREE + depends on DMABUF_HEAPS && DMABUF_HEAPS_DEFERRED_FREE && DMABUF_HEAPS_PAGE_POOL help Choose this option to enable the system dmabuf heap. The system heap is backed by pages from the buddy allocator. If in doubt, say Y.