diff options
Diffstat (limited to 'ion/ion.c')
| -rw-r--r-- | ion/ion.c | 72 |
1 files changed, 64 insertions, 8 deletions
@@ -17,6 +17,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#define LOG_TAG "ion" + +#include <cutils/log.h> #include <errno.h> #include <fcntl.h> #include <stdio.h> @@ -24,12 +27,8 @@ #include <sys/mman.h> #include <sys/types.h> -#define LOG_TAG "ion" -#include <cutils/log.h> - -#include "linux_ion.h" -#include "omap_ion.h" -#include "ion.h" +#include <linux/ion.h> +#include <ion/ion.h> int ion_open() { @@ -55,8 +54,8 @@ static int ion_ioctl(int fd, int req, void *arg) return ret; } -int ion_alloc(int fd, size_t len, size_t align, unsigned int flags, - struct ion_handle **handle) +int ion_alloc(int fd, size_t len, size_t align, + unsigned int flags, struct ion_handle **handle) { int ret; struct ion_allocation_data data = { @@ -81,6 +80,8 @@ int ion_alloc_tiler(int fd, size_t w, size_t h, int fmt, unsigned int flags, .h = h, .fmt = fmt, .flags = flags, + .out_align = PAGE_SIZE, + .token = 0, }; struct ion_custom_data custom_data = { @@ -154,3 +155,58 @@ int ion_import(int fd, int share_fd, struct ion_handle **handle) *handle = data.handle; return ret; } + +#if 0 +int ion_sync_fd(int fd, int handle_fd) +{ + struct ion_fd_data data = { + .fd = handle_fd, + }; + return ion_ioctl(fd, ION_IOC_SYNC, &data); +} +#endif + +int ion_map_cacheable(int fd, struct ion_handle *handle, size_t length, int prot, + int flags, off_t offset, unsigned char **ptr, int *map_fd) +{ + struct ion_fd_data data = { + .handle = handle, + .cacheable = 1, + }; + int ret = ion_ioctl(fd, ION_IOC_MAP, &data); + if (ret < 0) + return ret; + *map_fd = data.fd; + if (*map_fd < 0) { + ALOGE("map ioctl returned negative fd\n"); + return -EINVAL; + } + *ptr = mmap(NULL, length, prot, flags, *map_fd, offset); + if (*ptr == MAP_FAILED) { + ALOGE("mmap failed: %s\n", strerror(errno)); + return -errno; + } + return ret; +} + +int ion_flush_cached(int fd, struct ion_handle *handle, size_t length, + unsigned char *ptr) +{ + struct ion_cached_user_buf_data data = { + .handle = handle, + .vaddr = (unsigned long)ptr, + .size = length, + }; + return ion_ioctl(fd, ION_IOC_FLUSH_CACHED, &data); +} + +int ion_inval_cached(int fd, struct ion_handle *handle, size_t length, + unsigned char *ptr) +{ + struct ion_cached_user_buf_data data = { + .handle = handle, + .vaddr = (unsigned long)ptr, + .size = length, + }; + return ion_ioctl(fd, ION_IOC_INVAL_CACHED, &data); +} |