From e23ddb2ee42dafe4b25fb746eb350f187355f337 Mon Sep 17 00:00:00 2001 From: Ziyuan Xu Date: Tue, 21 Jun 2022 09:10:02 +0800 Subject: [PATCH] dma-buf: rk_heaps: call rk_add_default_cma_heap() early when ROCKCHIP_THUNDER_BOOT_ISP=y && !CONFIG_INITCALL_ASYNC Signed-off-by: Ziyuan Xu Change-Id: Ief7da5a7358b4e0625c68e2b51583f89cb0362c6 --- drivers/dma-buf/rk_heaps/rk-cma-heap.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/dma-buf/rk_heaps/rk-cma-heap.c b/drivers/dma-buf/rk_heaps/rk-cma-heap.c index 5c6aa681407a..6bd1ee47b030 100644 --- a/drivers/dma-buf/rk_heaps/rk-cma-heap.c +++ b/drivers/dma-buf/rk_heaps/rk-cma-heap.c @@ -605,7 +605,7 @@ static int __rk_add_cma_heap(struct cma *cma, void *data) return 0; } -static int rk_add_default_cma_heap(void) +static int __init rk_add_default_cma_heap(void) { struct cma *cma = rk_dma_heap_get_cma(); @@ -614,7 +614,12 @@ static int rk_add_default_cma_heap(void) return __rk_add_cma_heap(cma, NULL); } + +#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC) +subsys_initcall(rk_add_default_cma_heap); +#else module_init(rk_add_default_cma_heap); +#endif static void cma_procfs_format_array(char *buf, size_t bufsize, u32 *array, int array_size) {