]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
gpu: nvgpu: Infinite syncpt wait on presilicon
authorTerje Bergstrom <tbergstrom@nvidia.com>
Mon, 16 Mar 2015 22:36:28 +0000 (15:36 -0700)
committerTerje Bergstrom <tbergstrom@nvidia.com>
Thu, 19 Mar 2015 21:01:09 +0000 (14:01 -0700)
On presilicon, syncpt waits should have infinite timeout.

Change-Id: Ifa9b2fa0ef164e2f87a631bca77941e995b06ad4
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/717947
Reviewed-by: Kirill Artamonov <kartamonov@nvidia.com>
drivers/gpu/nvgpu/gk20a/fence_gk20a.c

index 1c34d8035bbd26f4fa8808520c864242c148066c..def916b32f4768e5c4808912a8b4bfbcaf57ac88 100644 (file)
@@ -64,6 +64,8 @@ struct gk20a_fence *gk20a_fence_get(struct gk20a_fence *f)
 
 int gk20a_fence_wait(struct gk20a_fence *f, int timeout)
 {
+       if (!tegra_platform_is_silicon())
+               timeout = (u32)MAX_SCHEDULE_TIMEOUT;
        return f->ops->wait(f, timeout);
 }