diff options
| author | Andrew Howe <ahowe@nvidia.com> | 2011-03-24 18:24:47 +0200 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-26 15:54:29 -0700 |
| commit | 3c0ba2a55f11f0ca98c37c8b187094b8fb22e214 (patch) | |
| tree | 9f183d1d8d234baf9c80677171d797edbf610351 /arch | |
| parent | e36db07d12eda146dfdb7f200836d0c279785f77 (diff) | |
video: tegra: host: Backwards compatible null kickoff
Change back to the backwards compatible null kickoff method
(having a separate ioctl).
Original-Change-Id: Ifb6e706ac9e068c5bc8d834fe61f797f14c5889f
Reviewed-on: http://git-master/r/24159
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Tested-by: Scott Williams <scwilliams@nvidia.com>
Change-Id: Ifde9ee33e072ec502fcd855ffc8d92d312946a00
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/nvhost.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/include/mach/nvhost.h b/arch/arm/mach-tegra/include/mach/nvhost.h index 5d8caa155730..d33a3ce04a85 100644 --- a/arch/arm/mach-tegra/include/mach/nvhost.h +++ b/arch/arm/mach-tegra/include/mach/nvhost.h @@ -3,7 +3,7 @@ * * Tegra graphics host driver * - * Copyright (c) 2009-2010, NVIDIA Corporation. + * Copyright (c) 2009-2011, NVIDIA Corporation. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -81,7 +81,6 @@ struct nvhost_submit_hdr { __u32 syncpt_incrs; __u32 num_cmdbufs; __u32 num_relocs; - __u32 null_kickoff; }; struct nvhost_cmdbuf { @@ -115,8 +114,10 @@ struct nvhost_set_nvmap_fd_args { _IOR(NVHOST_IOCTL_MAGIC, 4, struct nvhost_get_param_args) #define NVHOST_IOCTL_CHANNEL_SET_NVMAP_FD \ _IOW(NVHOST_IOCTL_MAGIC, 5, struct nvhost_set_nvmap_fd_args) +#define NVHOST_IOCTL_CHANNEL_NULL_KICKOFF \ + _IOR(NVHOST_IOCTL_MAGIC, 6, struct nvhost_get_param_args) #define NVHOST_IOCTL_CHANNEL_LAST \ - _IOC_NR(NVHOST_IOCTL_CHANNEL_SET_NVMAP_FD) + _IOC_NR(NVHOST_IOCTL_CHANNEL_NULL_KICKOFF) #define NVHOST_IOCTL_CHANNEL_MAX_ARG_SIZE sizeof(struct nvhost_get_param_args) struct nvhost_ctrl_syncpt_read_args { |