diff options
| author | Iliyan Malchev <malchev@google.com> | 2013-03-15 19:10:09 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2013-03-15 19:11:09 -0700 |
| commit | 677cddc7b686963450156e6a77a75fde2d43e1ac (patch) | |
| tree | 3669421a2c201c7b1f99eadbd1d06f1b4655e133 | |
| parent | f0edc3f155a136d87beccd5ecef75c2d4b6f6b64 (diff) | |
| download | msm8960-677cddc7b686963450156e6a77a75fde2d43e1ac.tar.gz | |
update ion.h header
Add the deprecated (and unused on msm8960) ION sync ioctl so that libion may
compile.
Change-Id: I851509eda9473e5cd57e2d27d6d0749d6d4b8719
Signed-off-by: Iliyan Malchev <malchev@google.com>
| -rw-r--r-- | kernel-headers/linux/ion.h | 5 | ||||
| -rw-r--r-- | original-kernel-headers/linux/ion.h | 16 |
2 files changed, 16 insertions, 5 deletions
diff --git a/kernel-headers/linux/ion.h b/kernel-headers/linux/ion.h index 4f501e8..f40abd0 100644 --- a/kernel-headers/linux/ion.h +++ b/kernel-headers/linux/ion.h @@ -29,7 +29,7 @@ enum ion_heap_type { ION_HEAP_TYPE_CARVEOUT, ION_HEAP_TYPE_DMA, ION_HEAP_TYPE_CUSTOM, - ION_NUM_HEAPS, + ION_NUM_HEAPS = 16, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; #define ION_HEAP_SYSTEM_MASK (1 << ION_HEAP_TYPE_SYSTEM) @@ -69,6 +69,7 @@ struct ion_custom_data { #define ION_IOC_SHARE _IOWR(ION_IOC_MAGIC, 4, struct ion_fd_data) #define ION_IOC_IMPORT _IOWR(ION_IOC_MAGIC, 5, struct ion_fd_data) #define ION_IOC_CUSTOM _IOWR(ION_IOC_MAGIC, 6, struct ion_custom_data) -#endif +#define ION_IOC_SYNC _IOWR(ION_IOC_MAGIC, 7, struct ion_fd_data) /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#endif diff --git a/original-kernel-headers/linux/ion.h b/original-kernel-headers/linux/ion.h index 7fee5ff..e94bf75 100644 --- a/original-kernel-headers/linux/ion.h +++ b/original-kernel-headers/linux/ion.h @@ -34,7 +34,9 @@ struct ion_handle; * carveout heap, allocations are physically * contiguous. Used for content protection. * @ION_HEAP_TYPE_DMA: memory allocated via DMA API - * @ION_HEAP_END: helper for iterating over heaps + * @ION_NUM_HEAPS: helper for iterating over heaps, a bit mask + * is used to identify the heaps, so only 32 + * total heap types are supported */ enum ion_heap_type { ION_HEAP_TYPE_SYSTEM, @@ -43,7 +45,7 @@ enum ion_heap_type { ION_HEAP_TYPE_DMA, ION_HEAP_TYPE_CUSTOM, /* must be last so device specific heaps always are at the end of this enum */ - ION_NUM_HEAPS, + ION_NUM_HEAPS = 16, }; #define ION_HEAP_SYSTEM_MASK (1 << ION_HEAP_TYPE_SYSTEM) @@ -606,5 +608,13 @@ struct ion_custom_data { */ #define ION_IOC_CUSTOM _IOWR(ION_IOC_MAGIC, 6, struct ion_custom_data) - +/** + * DOC: ION_IOC_SYNC - syncs a shared file descriptors to memory + * + * Deprecated in favor of using the dma_buf api's correctly (syncing + * will happend automatically when the buffer is mapped to a device). + * If necessary should be used after touching a cached buffer from the cpu, + * this will make the buffer in memory coherent. + */ +#define ION_IOC_SYNC _IOWR(ION_IOC_MAGIC, 7, struct ion_fd_data) #endif /* _LINUX_ION_H */ |