From 1d2e66540a37f04add5694d7aee9350cf6f6a78d Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 2 Jun 2016 12:25:57 -0700 Subject: gpu: nvgpu: Fix calculation of timeout Fix calculation of timeout in multiple places. The #defines GR_IDLE_CHECK_DEFAULT and GR_IDLE_CHECK_MAX are meant to be used only for defining the frequency of checking for timeout. Using them for actual timeouts makes the timeout really short. Change-Id: I3d0f8cbc91d619be8e5a9168ee1ab1d6298f129b Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1158269 --- drivers/gpu/nvgpu/gm206/bios_gm206.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gm206/bios_gm206.c') diff --git a/drivers/gpu/nvgpu/gm206/bios_gm206.c b/drivers/gpu/nvgpu/gm206/bios_gm206.c index 005507bc..212fae62 100644 --- a/drivers/gpu/nvgpu/gm206/bios_gm206.c +++ b/drivers/gpu/nvgpu/gm206/bios_gm206.c @@ -594,7 +594,7 @@ static int gm206_bios_devinit(struct gk20a *g) static int gm206_bios_preos(struct gk20a *g) { - int retries = GR_IDLE_CHECK_MAX / GR_IDLE_CHECK_DEFAULT; + int retries = PMU_BOOT_TIMEOUT_MAX / PMU_BOOT_TIMEOUT_DEFAULT; int err = 0; int val; @@ -610,7 +610,7 @@ static int gm206_bios_preos(struct gk20a *g) gk20a_dbg_fn("done"); break; } - udelay(GR_IDLE_CHECK_DEFAULT); + udelay(PMU_BOOT_TIMEOUT_DEFAULT); } while (--retries || !tegra_platform_is_silicon()); /* todo check retries */ -- cgit v1.2.2