diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2011-03-08 12:22:31 -0800 |
|---|---|---|
| committer | Rebecca Schultz Zavin <rebecca@android.com> | 2011-03-08 12:22:31 -0800 |
| commit | fe7c3561232ec411dc7d53dffb4544d397b130ca (patch) | |
| tree | 5cc16ee4d4d99e1575f25ac736cb49caa098c3ea /arch/arm/mach-tegra/include | |
| parent | 07a84a1ce6dae0bd521ac30c56ffc22f31da10b1 (diff) | |
| parent | be7b9ce20d645c2c9293441830ee33a0a5fc489f (diff) | |
Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'arch/arm/mach-tegra/include')
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/nvhost.h | 9 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/nvmap.h | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/include/mach/nvhost.h b/arch/arm/mach-tegra/include/mach/nvhost.h index c72666ae0d37..4bec3127a545 100644 --- a/arch/arm/mach-tegra/include/mach/nvhost.h +++ b/arch/arm/mach-tegra/include/mach/nvhost.h @@ -81,6 +81,8 @@ struct nvhost_submit_hdr { __u32 syncpt_incrs; __u32 num_cmdbufs; __u32 num_relocs; + __u32 num_waitchks; + __u32 waitchk_mask; }; struct nvhost_cmdbuf { @@ -96,6 +98,13 @@ struct nvhost_reloc { __u32 target_offset; }; +struct nvhost_waitchk { + __u32 mem; + __u32 offset; + __u32 syncpt_id; + __u32 thresh; +}; + struct nvhost_get_param_args { __u32 value; }; diff --git a/arch/arm/mach-tegra/include/mach/nvmap.h b/arch/arm/mach-tegra/include/mach/nvmap.h index 7422d1a44d8a..7a79748e5433 100644 --- a/arch/arm/mach-tegra/include/mach/nvmap.h +++ b/arch/arm/mach-tegra/include/mach/nvmap.h @@ -97,6 +97,10 @@ int nvmap_pin_array(struct nvmap_client *client, struct nvmap_handle *gather, void nvmap_unpin_handles(struct nvmap_client *client, struct nvmap_handle **h, int nr); +int nvmap_patch_wait(struct nvmap_client *client, + struct nvmap_handle *patch, + u32 patch_offset, u32 patch_value); + struct nvmap_platform_carveout { const char *name; unsigned int usage_mask; |