From 7196637a6e4f0dfca0eb8fd230e26ee4c7f3378f Mon Sep 17 00:00:00 2001 From: Ajay Dudani Date: Wed, 29 Aug 2012 18:02:11 -0700 Subject: [PATCH] gpu: ion: Add compatibility with future changes Several changes are pending to be pulled in which are not compatible with our changes. Specifically, a new field to the allocation ioctl is added and the ioctl numbers for cache flushing need to be changed. Add these changes now until full changes can be pulled in the future. Change-Id: I9540495e25c7b6c414a6e3719f66f2cd9f78c585 Signed-off-by: Laura Abbott Signed-off-by: Ajay Dudani --- include/linux/ion.h | 10 +++++----- include/linux/msm_ion.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/ion.h b/include/linux/ion.h index a99a3e37401..4a0e13805b4 100644 --- a/include/linux/ion.h +++ b/include/linux/ion.h @@ -826,7 +826,7 @@ struct ion_flag_data { * descriptor obtained from ION_IOC_SHARE and returns the struct with the handle * filed set to the corresponding opaque handle. */ -#define ION_IOC_IMPORT _IOWR(ION_IOC_MAGIC, 5, int) +#define ION_IOC_IMPORT _IOWR(ION_IOC_MAGIC, 5, struct ion_fd_data) /** * DOC: ION_IOC_CUSTOM - call architecture specific ion ioctl @@ -842,21 +842,21 @@ struct ion_flag_data { * * Clean the caches of the handle specified. */ -#define ION_IOC_CLEAN_CACHES _IOWR(ION_IOC_MAGIC, 7, \ +#define ION_IOC_CLEAN_CACHES _IOWR(ION_IOC_MAGIC, 20, \ struct ion_flush_data) /** * DOC: ION_MSM_IOC_INV_CACHES - invalidate the caches * * Invalidate the caches of the handle specified. */ -#define ION_IOC_INV_CACHES _IOWR(ION_IOC_MAGIC, 8, \ +#define ION_IOC_INV_CACHES _IOWR(ION_IOC_MAGIC, 21, \ struct ion_flush_data) /** * DOC: ION_MSM_IOC_CLEAN_CACHES - clean and invalidate the caches * * Clean and invalidate the caches of the handle specified. */ -#define ION_IOC_CLEAN_INV_CACHES _IOWR(ION_IOC_MAGIC, 9, \ +#define ION_IOC_CLEAN_INV_CACHES _IOWR(ION_IOC_MAGIC, 22, \ struct ion_flush_data) /** @@ -865,6 +865,6 @@ struct ion_flag_data { * Gets the flags of the current handle which indicate cachability, * secure state etc. */ -#define ION_IOC_GET_FLAGS _IOWR(ION_IOC_MAGIC, 10, \ +#define ION_IOC_GET_FLAGS _IOWR(ION_IOC_MAGIC, 23, \ struct ion_flag_data) #endif /* _LINUX_ION_H */ diff --git a/include/linux/msm_ion.h b/include/linux/msm_ion.h index 031b5552b68..0e28e54108c 100644 --- a/include/linux/msm_ion.h +++ b/include/linux/msm_ion.h @@ -17,6 +17,6 @@ #ifndef _LINUX_MSM_ION_H #define _LINUX_MSM_ION_H -#include +#include #endif