diff options
| author | Prashant Malani <pmalani@google.com> | 2015-01-12 13:57:59 -0800 |
|---|---|---|
| committer | Prashant Malani <pmalani@google.com> | 2015-01-12 13:57:59 -0800 |
| commit | b2c727c28e8964b2f8fbda5c2cecde87092946ec (patch) | |
| tree | 806d4ed2e657d62f4be1b397bcf8080a7f4dd05a /kernel-headers/linux/msm_ion.h | |
| parent | 50b91f901558f1148a254b8cd603b57930fb7ee1 (diff) | |
| download | msm8x26-master-soong.tar.gz | |
Revert "DO NOT MERGE Revert "Kernel headers for LNX.LW.2.0-00300-8x26.0""android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12master-soonglollipop-mr1-wfc-releaselollipop-mr1-dev
This reverts commit 50b91f901558f1148a254b8cd603b57930fb7ee1.
Diffstat (limited to 'kernel-headers/linux/msm_ion.h')
| -rw-r--r-- | kernel-headers/linux/msm_ion.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kernel-headers/linux/msm_ion.h b/kernel-headers/linux/msm_ion.h index 6bc0e5c..a86ed30 100644 --- a/kernel-headers/linux/msm_ion.h +++ b/kernel-headers/linux/msm_ion.h @@ -22,52 +22,52 @@ enum msm_ion_heap_types { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ ION_HEAP_TYPE_MSM_START = ION_HEAP_TYPE_CUSTOM + 1, - ION_HEAP_TYPE_DMA = ION_HEAP_TYPE_MSM_START, - ION_HEAP_TYPE_SECURE_DMA, + ION_HEAP_TYPE_SECURE_DMA = ION_HEAP_TYPE_MSM_START, ION_HEAP_TYPE_REMOVED, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ enum ion_heap_ids { INVALID_HEAP_ID = -1, ION_CP_MM_HEAP_ID = 8, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ ION_CP_MFC_HEAP_ID = 12, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ ION_CP_WB_HEAP_ID = 16, ION_CAMERA_HEAP_ID = 20, ION_SYSTEM_CONTIG_HEAP_ID = 21, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ ION_ADSP_HEAP_ID = 22, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ ION_PIL1_HEAP_ID = 23, ION_SF_HEAP_ID = 24, ION_SYSTEM_HEAP_ID = 25, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ ION_PIL2_HEAP_ID = 26, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ ION_QSECOM_HEAP_ID = 27, ION_AUDIO_HEAP_ID = 28, ION_MM_FIRMWARE_HEAP_ID = 29, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ ION_HEAP_ID_RESERVED = 31 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; #define ION_IOMMU_HEAP_ID ION_SYSTEM_HEAP_ID #define ION_HEAP_TYPE_IOMMU ION_HEAP_TYPE_SYSTEM -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ enum ion_fixed_position { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ NOT_FIXED, FIXED_LOW, FIXED_MIDDLE, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ FIXED_HIGH, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; enum cp_mem_usage { VIDEO_BITSTREAM = 0x1, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ VIDEO_PIXEL = 0x2, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ VIDEO_NONPIXEL = 0x3, - MAX_USAGE = 0x4, - UNKNOWN = 0x7FFFFFFF, + DISPLAY_SECURE_CP_USAGE = 0x4, + CAMERA_SECURE_CP_USAGE = 0x5, + MAX_USAGE = 0x6, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + UNKNOWN = 0x7FFFFFFF, }; -#define ION_HEAP_TYPE_DMA_MASK (1 << ION_HEAP_TYPE_DMA) #define ION_FLAG_SECURE (1 << ION_HEAP_ID_RESERVED) #define ION_FLAG_FORCE_CONTIGUOUS (1 << 30) /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ |