summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPaul Hodgson <phodgson@nvidia.com>2011-03-09 04:18:26 -0800
committerRohan Somvanshi <rsomvanshi@nvidia.com>2011-06-10 01:11:26 -0700
commit7d28e48a0e2ef8240fe1104a7c4e53f542cd7e92 (patch)
tree3ff712f6eac4133c6617513ff2da5ca31967ea26 /arch
parent7798bb9251068a190af7c1bbf616ad8af01bbe52 (diff)
[ARM] tegra: Extend the wait interface in the host
Extend the wait interface to relay the actual resultant waited point back. Reviewed-on: http://git-master/r/23033 (cherry picked from commit bc22c56ecb54ec093262cee4b1105c2503e5497e) Change-Id: I65224359f85d3f357e48eeacdf76c9bd97056a54 Reviewed-on: http://git-master/r/35919 Reviewed-by: Brian Anderson <branderson@nvidia.com> Tested-by: Brian Anderson <branderson@nvidia.com> Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/include/mach/nvhost.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/include/mach/nvhost.h b/arch/arm/mach-tegra/include/mach/nvhost.h
index fc18f2e6292e..b769147ab1f4 100644
--- a/arch/arm/mach-tegra/include/mach/nvhost.h
+++ b/arch/arm/mach-tegra/include/mach/nvhost.h
@@ -161,6 +161,13 @@ struct nvhost_ctrl_syncpt_wait_args {
__s32 timeout;
};
+struct nvhost_ctrl_syncpt_waitex_args {
+ __u32 id;
+ __u32 thresh;
+ __s32 timeout;
+ __u32 value;
+};
+
struct nvhost_ctrl_module_mutex_args {
__u32 id;
__u32 lock;
@@ -187,8 +194,11 @@ struct nvhost_ctrl_module_regrdwr_args {
#define NVHOST_IOCTL_CTRL_MODULE_REGRDWR \
_IOWR(NVHOST_IOCTL_MAGIC, 5, struct nvhost_ctrl_module_regrdwr_args)
+#define NVHOST_IOCTL_CTRL_SYNCPT_WAITEX \
+ _IOWR(NVHOST_IOCTL_MAGIC, 6, struct nvhost_ctrl_syncpt_waitex_args)
+
#define NVHOST_IOCTL_CTRL_LAST \
- _IOC_NR(NVHOST_IOCTL_CTRL_MODULE_REGRDWR)
+ _IOC_NR(NVHOST_IOCTL_CTRL_SYNCPT_WAITEX)
#define NVHOST_IOCTL_CTRL_MAX_ARG_SIZE sizeof(struct nvhost_ctrl_module_regrdwr_args)
#endif