diff options
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 fdbf5cc8efc1..7e73d26a072e 100644 --- a/drivers/video/tegra/host/dev.c +++ b/drivers/video/tegra/host/dev.c @@ -499,9 +499,9 @@ static int nvhost_ioctl_ctrl_syncpt_incr( return 0; } -static int nvhost_ioctl_ctrl_syncpt_wait( +static int nvhost_ioctl_ctrl_syncpt_waitex( struct nvhost_ctrl_userctx *ctx, - struct nvhost_ctrl_syncpt_wait_args *args) + struct nvhost_ctrl_syncpt_waitex_args *args) { u32 timeout; if (args->id >= NV_HOST1X_SYNCPT_NB_PTS) @@ -512,7 +512,7 @@ static int nvhost_ioctl_ctrl_syncpt_wait( timeout = (u32)msecs_to_jiffies(args->timeout); return nvhost_syncpt_wait_timeout(&ctx->dev->syncpt, args->id, - args->thresh, timeout); + args->thresh, timeout, &args->value); } static int nvhost_ioctl_ctrl_module_mutex( @@ -610,7 +610,7 @@ static long nvhost_ctrlctl(struct file *filp, err = nvhost_ioctl_ctrl_syncpt_incr(priv, (void *)buf); break; case NVHOST_IOCTL_CTRL_SYNCPT_WAIT: - err = nvhost_ioctl_ctrl_syncpt_wait(priv, (void *)buf); + err = nvhost_ioctl_ctrl_syncpt_waitex(priv, (void *)buf); break; case NVHOST_IOCTL_CTRL_MODULE_MUTEX: err = nvhost_ioctl_ctrl_module_mutex(priv, (void *)buf); @@ -618,6 +618,9 @@ static long nvhost_ctrlctl(struct file *filp, case NVHOST_IOCTL_CTRL_MODULE_REGRDWR: err = nvhost_ioctl_ctrl_module_regrdwr(priv, (void *)buf); break; + case NVHOST_IOCTL_CTRL_SYNCPT_WAITEX: + err = nvhost_ioctl_ctrl_syncpt_waitex(priv, (void *)buf); + break; default: err = -ENOTTY; break; |