summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/include/mach
diff options
context:
space:
mode:
authorRebecca Schultz Zavin <rebecca@android.com>2011-03-03 14:28:07 -0800
committerRebecca Schultz Zavin <rebecca@android.com>2011-03-03 14:28:07 -0800
commitb3cc1d84d0b962fe80fc297d2e2417c3157508b6 (patch)
treee1e68a48792509db347f2ce051e93d170538da65 /arch/arm/mach-tegra/include/mach
parent2d49bf33f3885aab293f12d54447f66e911e3226 (diff)
Revert "tegra: host: move stale wait checking into the kernel"
This reverts commit 2d49bf33f3885aab293f12d54447f66e911e3226.
Diffstat (limited to 'arch/arm/mach-tegra/include/mach')
-rw-r--r--arch/arm/mach-tegra/include/mach/nvhost.h9
-rw-r--r--arch/arm/mach-tegra/include/mach/nvmap.h4
2 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-tegra/include/mach/nvhost.h b/arch/arm/mach-tegra/include/mach/nvhost.h
index 4bec3127a545..c72666ae0d37 100644
--- a/arch/arm/mach-tegra/include/mach/nvhost.h
+++ b/arch/arm/mach-tegra/include/mach/nvhost.h
@@ -81,8 +81,6 @@ struct nvhost_submit_hdr {
__u32 syncpt_incrs;
__u32 num_cmdbufs;
__u32 num_relocs;
- __u32 num_waitchks;
- __u32 waitchk_mask;
};
struct nvhost_cmdbuf {
@@ -98,13 +96,6 @@ 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 7a79748e5433..7422d1a44d8a 100644
--- a/arch/arm/mach-tegra/include/mach/nvmap.h
+++ b/arch/arm/mach-tegra/include/mach/nvmap.h
@@ -97,10 +97,6 @@ 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;