diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2011-12-19 15:12:06 +0200 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-22 11:32:23 +0530 |
| commit | d993b01464a87a76d0b859e570cb78caaf1996f9 (patch) | |
| tree | 92b3af033ec92c282f196848d745ec34a9e23d4f /drivers/video/tegra/host/nvhost_cdma.h | |
| parent | 204b15d959afb9d3d675c949262ce545c17e7c69 (diff) | |
video: tegra: host: Move timeout to hwctx & job structs
Timeout struct contains fields which are accessed even after client has
quit. Move the fields to hwctx and nvhost_job so that they can be
accessed when submits complete.
Bug 917340
Change-Id: I322c38d32bc801aa9b061355a17be7f605692e18
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/71004
Reviewed-by: Automatic_Commit_Validation_User
Tested-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/host/nvhost_cdma.h')
| -rw-r--r-- | drivers/video/tegra/host/nvhost_cdma.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/tegra/host/nvhost_cdma.h b/drivers/video/tegra/host/nvhost_cdma.h index c8c9e168b833..87b6a14d60e3 100644 --- a/drivers/video/tegra/host/nvhost_cdma.h +++ b/drivers/video/tegra/host/nvhost_cdma.h @@ -80,7 +80,8 @@ struct buffer_timeout { u32 syncpt_val; /* syncpt value when completed */ ktime_t start_ktime; /* starting time */ /* context timeout information */ - struct nvhost_userctx_timeout *ctx_timeout; + struct nvhost_hwctx *ctx; + int clientid; }; enum cdma_event { @@ -116,8 +117,7 @@ struct nvhost_cdma { int nvhost_cdma_init(struct nvhost_cdma *cdma); void nvhost_cdma_deinit(struct nvhost_cdma *cdma); void nvhost_cdma_stop(struct nvhost_cdma *cdma); -int nvhost_cdma_begin(struct nvhost_cdma *cdma, - struct nvhost_userctx_timeout *timeout); +int nvhost_cdma_begin(struct nvhost_cdma *cdma, struct nvhost_job *job); void nvhost_cdma_push(struct nvhost_cdma *cdma, u32 op1, u32 op2); #define NVHOST_CDMA_PUSH_GATHER_CTXSAVE 0xffffffff void nvhost_cdma_push_gather(struct nvhost_cdma *cdma, |