summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/tegra
diff options
context:
space:
mode:
authorDmitry Osipenko <digetx@gmail.com>2017-12-20 18:46:14 +0300
committerThierry Reding <treding@nvidia.com>2017-12-21 14:52:39 +0100
commit4c69ac12e39d3d623686d1c421b05d604e1c6db9 (patch)
tree4db1a96aa23c8ae11f5441fe752e17c66f9c1df8 /drivers/gpu/drm/tegra
parent04184b1fc990ac67777392be87e020e4f1af185c (diff)
downloadtalos-obmc-linux-4c69ac12e39d3d623686d1c421b05d604e1c6db9.tar.gz
talos-obmc-linux-4c69ac12e39d3d623686d1c421b05d604e1c6db9.zip
drm/tegra: Correct timeout in tegra_syncpt_wait
host1x_syncpt_wait() takes timeout value in jiffies, but DRM passes it in milliseconds. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/drm/tegra')
-rw-r--r--drivers/gpu/drm/tegra/drm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 52468f669277..ff931d3508a9 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -661,7 +661,8 @@ static int tegra_syncpt_wait(struct drm_device *drm, void *data,
if (!sp)
return -EINVAL;
- return host1x_syncpt_wait(sp, args->thresh, args->timeout,
+ return host1x_syncpt_wait(sp, args->thresh,
+ msecs_to_jiffies(args->timeout),
&args->value);
}
OpenPOWER on IntegriCloud