From 4f26f89c9c697b9f46501a4a4e8d4b8542ae4eb6 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Wed, 28 Apr 2021 13:27:13 -0700 Subject: [PATCH] ion: msm: Add support for the audio carveout heap Define a new carveout heap that will be used for audio usecases. Change-Id: I7da5e3c32f9bd8ba0d8cdcb6b8a1521b420c3d4a Signed-off-by: Isaac J. Manjarres --- drivers/staging/android/ion/heaps/msm_ion.c | 6 +++++- drivers/staging/android/ion/heaps/msm_ion_priv.h | 3 ++- include/uapi/linux/msm_ion_ids.h | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/staging/android/ion/heaps/msm_ion.c b/drivers/staging/android/ion/heaps/msm_ion.c index c9bdaa09c8e9..1f97b25ad546 100644 --- a/drivers/staging/android/ion/heaps/msm_ion.c +++ b/drivers/staging/android/ion/heaps/msm_ion.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved. */ #include @@ -97,6 +97,10 @@ static struct ion_heap_desc ion_heap_meta[] = { .id = ION_AUDIO_ML_HEAP_ID, .name = ION_AUDIO_ML_HEAP_NAME, }, + { + .id = ION_AUDIO_CARVEOUT_HEAP_ID, + .name = ION_AUDIO_CARVEOUT_HEAP_NAME, + }, }; #define MAKE_HEAP_TYPE_MAPPING(h) { .name = #h, \ diff --git a/drivers/staging/android/ion/heaps/msm_ion_priv.h b/drivers/staging/android/ion/heaps/msm_ion_priv.h index 66ea173e853c..9d4a521d1a1e 100644 --- a/drivers/staging/android/ion/heaps/msm_ion_priv.h +++ b/drivers/staging/android/ion/heaps/msm_ion_priv.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2011 Google, Inc. - * Copyright (c) 2011-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2021, The Linux Foundation. All rights reserved. */ #ifndef _MSM_ION_PRIV_H @@ -41,6 +41,7 @@ #define ION_TUI_CARVEOUT_HEAP_NAME "tui_carveout" #define ION_DISPLAY_HEAP_NAME "display" #define ION_AUDIO_ML_HEAP_NAME "audio_ml" +#define ION_AUDIO_CARVEOUT_HEAP_NAME "audio_carveout" /** * Debug feature. Make ION allocations DMA diff --git a/include/uapi/linux/msm_ion_ids.h b/include/uapi/linux/msm_ion_ids.h index 857661963724..0e559effe430 100644 --- a/include/uapi/linux/msm_ion_ids.h +++ b/include/uapi/linux/msm_ion_ids.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* - * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved. */ #ifndef _MSM_ION_IDS_H #define _MSM_ION_IDS_H @@ -31,6 +31,7 @@ #define ION_SPSS_HEAP_ID ION_BIT(14) #define ION_SECURE_CARVEOUT_HEAP_ID ION_BIT(15) #define ION_TUI_CARVEOUT_HEAP_ID ION_BIT(16) +#define ION_AUDIO_CARVEOUT_HEAP_ID ION_BIT(17) #define ION_SYSTEM_HEAP_ID ION_BIT(25) #define ION_HEAP_ID_RESERVED ION_BIT(31)