From: Terje Bergstrom <tbergstrom@nvidia.com>
Date: Mon, 16 Mar 2015 22:36:28 +0000 (-0700)
Subject: gpu: nvgpu: Infinite syncpt wait on presilicon
X-Git-Tag: tegra-l4t-r24.1~3103
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/nv-tegra/linux-3.10.git/commitdiff_plain/f936628a196f6a6233c69b88c6c71e3b1c8f8e69

gpu: nvgpu: Infinite syncpt wait on presilicon

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>
---

diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
index 1c34d8035bb..def916b32f4 100644
--- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
@@ -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);
 }