diff options
| author | Prayas Mohanty <pmohanty@nvidia.com> | 2011-05-02 16:24:23 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:45:03 -0800 |
| commit | b85a6a1ece6dcb5ef32d5be7905b8b8d45f95f0f (patch) | |
| tree | 549bdc602fbf407513bfb089acd8f016009a2526 /drivers/video/tegra/host/nvhost_channel.c | |
| parent | c5fc5908ae080ea5e1be05a8bf25a5978d8cf014 (diff) | |
video: tegra: host: add additional syncpoint id
For stereo camera, we need to read syncpoints from
both the rear sensors which are on their own pixel
parsers. Add an additional sw syncpoint for that.
bug 787214
bug 786928
Original-Change-Id: I4dff7fa636ff548de44544f845a5a1ba0c402d6d
Reviewed-on: http://git-master/r/30009
Tested-by: Prayas Mohanty <pmohanty@nvidia.com>
Reviewed-by: Andrew Howe <ahowe@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: Gary Zhang <garyz@nvidia.com>
Reviewed-by: Erik M Lilliebjerg <elilliebjerg@nvidia.com>
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Rebase-Id: R927b1c2297441f9c30afdc8c623a8299340b6771
Diffstat (limited to 'drivers/video/tegra/host/nvhost_channel.c')
| -rw-r--r-- | drivers/video/tegra/host/nvhost_channel.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/tegra/host/nvhost_channel.c b/drivers/video/tegra/host/nvhost_channel.c index 68caff5c5ad4..8e16f6285eed 100644 --- a/drivers/video/tegra/host/nvhost_channel.c +++ b/drivers/video/tegra/host/nvhost_channel.c @@ -75,9 +75,10 @@ static const struct nvhost_channeldesc channelmap[] = { { /* channel 4 */ .name = "vi", - .syncpts = BIT(NVSYNCPT_VI_ISP_0) | BIT(NVSYNCPT_VI_ISP_1) | + .syncpts = BIT(NVSYNCPT_CSI_VI_0) | BIT(NVSYNCPT_CSI_VI_1) | + BIT(NVSYNCPT_VI_ISP_0) | BIT(NVSYNCPT_VI_ISP_1) | BIT(NVSYNCPT_VI_ISP_2) | BIT(NVSYNCPT_VI_ISP_3) | - BIT(NVSYNCPT_VI_ISP_4) | BIT(NVSYNCPT_VI_ISP_5), + BIT(NVSYNCPT_VI_ISP_4), .modulemutexes = BIT(NVMODMUTEX_VI), .exclusive = true, }, |