diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
index 1c34d8035..def916b32 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);
 }