A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-06 03:45:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "ion: Add support for the display non-secure CMA heap"

Browse source
This commit is contained in:
qctecmdr 2020-06-15 09:59:41 -07:00 • committed by Gerrit - the friendly Code Review server
commit bbc7f2d3ed
4 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/soc/qcom/mem-buf.c
View file

@ -973,7 +973,7 @@ static int mem_buf_unmap_mem_s2(hh_memparcel_handle_t memparcel_hdl)
int ret;
pr_debug("%s: removing CPU MMU stage 2 mappings\n", __func__);
ret = hh_rm_mem_release(memparcel_hdl, HH_RM_MEM_RELEASE_CLEAR);
ret = hh_rm_mem_release(memparcel_hdl, 0);
if (ret < 0)
pr_err("%s: Failed to release memparcel hdl: 0x%lx rc: %d\n",

4
drivers/staging/android/ion/heaps/msm_ion.c
View file

@ -83,6 +83,10 @@ static struct ion_heap_desc ion_heap_meta[] = {
.id = ION_TUI_CARVEOUT_HEAP_ID,
.name = ION_TUI_CARVEOUT_HEAP_NAME,
},
{
.id = ION_DISPLAY_HEAP_ID,
.name = ION_DISPLAY_HEAP_NAME,
},
};
#define MAKE_HEAP_TYPE_MAPPING(h) { .name = #h, \

1
drivers/staging/android/ion/heaps/msm_ion_priv.h
View file

@ -39,6 +39,7 @@
#define ION_SECURE_DISPLAY_HEAP_NAME "secure_display"
#define ION_AUDIO_HEAP_NAME "audio"
#define ION_TUI_CARVEOUT_HEAP_NAME "tui_carveout"
#define ION_DISPLAY_HEAP_NAME "display"
/**
* Debug feature. Make ION allocations DMA

1
include/uapi/linux/msm_ion_ids.h
View file

@ -19,6 +19,7 @@
#define ION_SYSTEM_HEAP_ID ION_BIT(0)
#define ION_QSECOM_TA_HEAP_ID ION_BIT(1)
#define ION_CAMERA_HEAP_ID ION_BIT(2)
#define ION_DISPLAY_HEAP_ID ION_BIT(3)
#define ION_ADSP_HEAP_ID ION_BIT(4)
#define ION_USER_CONTIG_HEAP_ID ION_BIT(6)
#define ION_QSECOM_HEAP_ID ION_BIT(7)