diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2011-11-17 13:11:21 +0200 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-02-18 10:23:51 -0800 |
| commit | 779324a9b98d37b6d8b443b682e4f5dc608cb1ef (patch) | |
| tree | 263cc478097af48808c203e92fe83c5dfca81a00 /drivers/video/tegra/host/dev.c | |
| parent | 233f011b4784e7e1b7c90f0a63827668da444661 (diff) | |
video: tegra: host: Add syncpt value to traces
Add current values of sync points to sync point read and wait
IOCTL's.
Change-Id: I479a66e283b47867ed13685b75c1858b4fb65c2d
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/80006
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/host/dev.c')
| -rw-r--r-- | drivers/video/tegra/host/dev.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/video/tegra/host/dev.c b/drivers/video/tegra/host/dev.c index 4cd1e4eaf843..8d002979de1e 100644 --- a/drivers/video/tegra/host/dev.c +++ b/drivers/video/tegra/host/dev.c @@ -567,8 +567,8 @@ static int nvhost_ioctl_ctrl_syncpt_read( { if (args->id >= ctx->dev->syncpt.nb_pts) return -EINVAL; - trace_nvhost_ioctl_ctrl_syncpt_read(args->id); args->value = nvhost_syncpt_read(&ctx->dev->syncpt, args->id); + trace_nvhost_ioctl_ctrl_syncpt_read(args->id, args->value); return 0; } @@ -588,6 +588,7 @@ static int nvhost_ioctl_ctrl_syncpt_waitex( struct nvhost_ctrl_syncpt_waitex_args *args) { u32 timeout; + int err; if (args->id >= ctx->dev->syncpt.nb_pts) return -EINVAL; if (args->timeout == NVHOST_NO_TIMEOUT) @@ -595,10 +596,12 @@ static int nvhost_ioctl_ctrl_syncpt_waitex( else timeout = (u32)msecs_to_jiffies(args->timeout); - trace_nvhost_ioctl_ctrl_syncpt_wait(args->id, args->thresh, - args->timeout); - return nvhost_syncpt_wait_timeout(&ctx->dev->syncpt, args->id, + err = nvhost_syncpt_wait_timeout(&ctx->dev->syncpt, args->id, args->thresh, timeout, &args->value); + trace_nvhost_ioctl_ctrl_syncpt_wait(args->id, args->thresh, + args->timeout, args->value, err); + + return err; } static int nvhost_ioctl_ctrl_module_mutex( |