diff options
| author | Jin Qian <jqian@nvidia.com> | 2013-01-11 17:49:16 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:21:59 -0700 |
| commit | 76cfe4469b6799c3fe99c2aaa430389e5fb8a933 (patch) | |
| tree | 3a697da3f9d94e75264f6122403d22f8ff86d60c /include/linux/nvhost_ioctl.h | |
| parent | 06b4b37ab025055005a1e4d1d44fef611024f27d (diff) | |
drivers: video: tegra: remove deprecate t124 routines
Moved T124 ioctls to start from 100.
Bug 1040912
Change-Id: I79a01855f6d74edc0a9fd89549de9e948a6026b8
Signed-off-by: Jin Qian <jqian@nvidia.com>
Reviewed-on: http://git-master/r/190811
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Chao Xu <cxu@nvidia.com>
Diffstat (limited to 'include/linux/nvhost_ioctl.h')
| -rw-r--r-- | include/linux/nvhost_ioctl.h | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/include/linux/nvhost_ioctl.h b/include/linux/nvhost_ioctl.h index f4ffbfa41e62..541f79070927 100644 --- a/include/linux/nvhost_ioctl.h +++ b/include/linux/nvhost_ioctl.h @@ -243,29 +243,6 @@ struct nvhost_zcull_bind_args { __u32 mode; }; -#define NVHOST_ZBC_COLOR_VALUE_SIZE 4 -#define NVHOST_ZBC_TYPE_INVALID 0 -#define NVHOST_ZBC_TYPE_COLOR 1 -#define NVHOST_ZBC_TYPE_DEPTH 2 - -struct nvhost_zbc_set_table_args { - __u32 color_ds[NVHOST_ZBC_COLOR_VALUE_SIZE]; - __u32 color_l2[NVHOST_ZBC_COLOR_VALUE_SIZE]; - __u32 depth; - __u32 format; - __u32 type; /* color or depth */ -}; - -struct nvhost_zbc_query_table_args { - __u32 color_ds[NVHOST_ZBC_COLOR_VALUE_SIZE]; - __u32 color_l2[NVHOST_ZBC_COLOR_VALUE_SIZE]; - __u32 depth; - __u32 ref_cnt; - __u32 format; - __u32 type; /* color or depth */ - __u32 index_size; /* [out] size, [in] index */ -}; - struct nvhost_ctrl_module_regrdwr_args { __u32 id; __u32 num_offsets; @@ -367,15 +344,10 @@ struct nvhost_set_ctxswitch_args { #define NVHOST_IOCTL_CHANNEL_FREE_OBJ_CTX \ _IOR(NVHOST_IOCTL_MAGIC, 105, struct nvhost_free_obj_ctx_args) -#define NVHOST_IOCTL_CHANNEL_ZBC_SET_TABLE \ - _IOWR(NVHOST_IOCTL_MAGIC, 126, struct nvhost_zbc_set_table_args) -#define NVHOST_IOCTL_CHANNEL_ZBC_QUERY_TABLE \ - _IOWR(NVHOST_IOCTL_MAGIC, 127, struct nvhost_zbc_query_table_args) - #define NVHOST_IOCTL_CHANNEL_LAST \ - _IOC_NR(NVHOST_IOCTL_CHANNEL_ZBC_QUERY_TABLE) + _IOC_NR(NVHOST_IOCTL_CHANNEL_ZCULL_BIND) -#define NVHOST_IOCTL_CHANNEL_MAX_ARG_SIZE sizeof(struct nvhost_zbc_query_table_args) +#define NVHOST_IOCTL_CHANNEL_MAX_ARG_SIZE sizeof(struct nvhost_submit_args) struct nvhost_ctrl_syncpt_read_args { __u32 id; |