diff options
| author | Lajos Molnar <molnar@ti.com> | 2011-04-07 08:41:08 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-04-07 08:41:08 +0100 |
| commit | 343cce776c854ae9fcf2033ee3ea2dd0cb487be3 (patch) | |
| tree | 24997bf25e63fafd81e0fee59c551039f0e58ea8 /drivers/media/video/tiler | |
| parent | e1bc7de4a68ee9b3032a9fe7e969896b3498ebb6 (diff) | |
TILER: Updated to v2.0 userspace API.
This patch requires similar changes in user space API/memmgr
header files.
Signed-off-by: Lajos Molnar <molnar@ti.com>
Diffstat (limited to 'drivers/media/video/tiler')
| -rw-r--r-- | drivers/media/video/tiler/tiler.c | 10 | ||||
| -rw-r--r-- | drivers/media/video/tiler/tiler_def.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/tiler/tiler.c b/drivers/media/video/tiler/tiler.c index 8754d457fdd..ee8c56b97e2 100644 --- a/drivers/media/video/tiler/tiler.c +++ b/drivers/media/video/tiler/tiler.c @@ -1119,7 +1119,7 @@ static s32 tiler_ioctl(struct inode *ip, struct file *filp, u32 cmd, struct tiler_block_info block_info = {0}; switch (cmd) { - case TILIOC_GBUF: + case TILIOC_GBLK: if (copy_from_user(&block_info, (void __user *)arg, sizeof(block_info))) return -EFAULT; @@ -1150,8 +1150,8 @@ static s32 tiler_ioctl(struct inode *ip, struct file *filp, u32 cmd, sizeof(block_info))) return -EFAULT; break; - case TILIOC_FBUF: - case TILIOC_UMBUF: + case TILIOC_FBLK: + case TILIOC_UMBLK: if (copy_from_user(&block_info, (void __user *)arg, sizeof(block_info))) return -EFAULT; @@ -1180,7 +1180,7 @@ static s32 tiler_ioctl(struct inode *ip, struct file *filp, u32 cmd, /* va not in page table */ return 0x0; break; - case TILIOC_MBUF: + case TILIOC_MBLK: if (copy_from_user(&block_info, (void __user *)arg, sizeof(block_info))) return -EFAULT; @@ -1258,7 +1258,7 @@ static s32 tiler_ioctl(struct inode *ip, struct file *filp, u32 cmd, mutex_unlock(&mtx); return -EFAULT; break; - case TILIOC_QUERY_BLK: + case TILIOC_QBLK: if (copy_from_user(&block_info, (void __user *)arg, sizeof(block_info))) return -EFAULT; diff --git a/drivers/media/video/tiler/tiler_def.h b/drivers/media/video/tiler/tiler_def.h index d92bfde8e45..61212295ebb 100644 --- a/drivers/media/video/tiler/tiler_def.h +++ b/drivers/media/video/tiler/tiler_def.h @@ -25,7 +25,7 @@ #define TILER_ACC_MODE_SHIFT (27) #define TILER_ACC_MODE_MASK (3) -#define TILER_GET_ACC_MODE(x) ((enum tiler_fmt) (1 + \ +#define TILER_GET_ACC_MODE(x) ((enum tiler_fmt) (TILFMT_8BIT + \ (((u32)x & (TILER_ACC_MODE_MASK<<TILER_ACC_MODE_SHIFT))>>TILER_ACC_MODE_SHIFT))) #define TILER_ALIAS_BASE (0x60000000) |