diff --git a/drivers/staging/android/ion/heaps/msm_ion.c b/drivers/staging/android/ion/heaps/msm_ion.c index 0be995f17f53..a8c749caf1f6 100644 --- a/drivers/staging/android/ion/heaps/msm_ion.c +++ b/drivers/staging/android/ion/heaps/msm_ion.c @@ -78,7 +78,11 @@ static struct ion_heap_desc ion_heap_meta[] = { { .id = ION_SECURE_CARVEOUT_HEAP_ID, .name = ION_SECURE_CARVEOUT_HEAP_NAME, - } + }, + { + .id = ION_TUI_CARVEOUT_HEAP_ID, + .name = ION_TUI_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 96dcdb91d53d..a46a78341733 100644 --- a/drivers/staging/android/ion/heaps/msm_ion_priv.h +++ b/drivers/staging/android/ion/heaps/msm_ion_priv.h @@ -38,6 +38,7 @@ #define ION_SECURE_HEAP_NAME "secure_heap" #define ION_SECURE_DISPLAY_HEAP_NAME "secure_display" #define ION_AUDIO_HEAP_NAME "audio" +#define ION_TUI_CARVEOUT_HEAP_NAME "tui_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 0baf49a26fbb..c698ee1d3035 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, The Linux Foundation. All rights reserved. + * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. */ #ifndef _MSM_ION_IDS_H #define _MSM_ION_IDS_H @@ -17,6 +17,7 @@ */ #define ION_SYSTEM_HEAP_ID ION_BIT(0) +#define ION_TUI_CARVEOUT_HEAP_ID ION_BIT(2) #define ION_QSECOM_TA_HEAP_ID ION_BIT(8) #define ION_CAMERA_HEAP_ID ION_BIT(9) #define ION_ADSP_HEAP_ID ION_BIT(11)