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-13 00:00:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "staging: android: ion: Add support for the audio ML heap"

Browse source
This commit is contained in:
qctecmdr 2020-07-09 06:59:34 -07:00 • committed by Gerrit - the friendly Code Review server
commit 7c50cfcbd9
5 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/soc/qcom/secure_buffer.c
View file

@ -268,6 +268,8 @@ const char *msm_secure_vmid_to_string(int secure_vmid)
return "VMID_CP_SEC_DISPLAY";
case VMID_CP_APP:
return "VMID_CP_APP";
case VMID_LPASS:
return "VMID_LPASS";
case VMID_WLAN:
return "VMID_WLAN";
case VMID_WLAN_CE:
@ -280,6 +282,8 @@ const char *msm_secure_vmid_to_string(int secure_vmid)
return "VMID_CP_SPSS_SP_SHARED";
case VMID_CP_SPSS_HLOS_SHARED:
return "VMID_CP_SPSS_HLOS_SHARED";
case VMID_ADSP_HEAP:
return "VMID_ADSP_HEAP";
case VMID_INVAL:
return "VMID_INVAL";
default:

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

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

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

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

2
include/soc/qcom/secure_buffer.h
View file

@ -26,12 +26,14 @@ enum vmid {
VMID_MSS_NONMSA = 0x10,
VMID_CP_SEC_DISPLAY = 0x11,
VMID_CP_APP = 0x12,
VMID_LPASS = 0x16,
VMID_WLAN = 0x18,
VMID_WLAN_CE = 0x19,
VMID_CP_SPSS_SP = 0x1A,
VMID_CP_CAMERA_PREVIEW = 0x1D,
VMID_CP_SPSS_SP_SHARED = 0x22,
VMID_CP_SPSS_HLOS_SHARED = 0x24,
VMID_ADSP_HEAP = 0x25,
VMID_CP_CDSP = 0x2A,
VMID_LAST,
VMID_INVAL = -1

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

@ -21,6 +21,7 @@
#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_AUDIO_ML_HEAP_ID ION_BIT(5)
#define ION_USER_CONTIG_HEAP_ID ION_BIT(6)
#define ION_QSECOM_HEAP_ID ION_BIT(7)
#define ION_AUDIO_HEAP_ID ION_BIT(8)