diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-03-21 11:35:42 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-03-21 11:35:42 +0530 |
| commit | ca83a98c25a409e9d831b7c4cff9e9fbda243a8d (patch) | |
| tree | e3154748d8d12b20fa8ff1f042cf167c5f743904 /arch | |
| parent | a2ec163cba01aec15cce0dda1b989f8b7acf1f4b (diff) | |
| parent | c93a3daa853cfb5c2d1b89b8db6c654c458097a1 (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Change-Id: I517760af5756279b41836062063bdcaa04e5bfef
Diffstat (limited to 'arch')
| -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 fc0336a42b50..1a113711aa47 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; |