diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-06-02 15:25:57 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-06-05 23:44:19 -0400 |
commit | 1d2e66540a37f04add5694d7aee9350cf6f6a78d (patch) | |
tree | 58b8d1ab7c0e7d2e51050113877bbc51d0c6ff39 /drivers/gpu/nvgpu/gm206/bios_gm206.c | |
parent | b77cca1d62790176442df8b9bb7f82b05a0c190f (diff) |
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 <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1158269
Diffstat (limited to 'drivers/gpu/nvgpu/gm206/bios_gm206.c')
-rw-r--r-- | drivers/gpu/nvgpu/gm206/bios_gm206.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
594 | 594 | ||
595 | static int gm206_bios_preos(struct gk20a *g) | 595 | static int gm206_bios_preos(struct gk20a *g) |
596 | { | 596 | { |
597 | int retries = GR_IDLE_CHECK_MAX / GR_IDLE_CHECK_DEFAULT; | 597 | int retries = PMU_BOOT_TIMEOUT_MAX / PMU_BOOT_TIMEOUT_DEFAULT; |
598 | int err = 0; | 598 | int err = 0; |
599 | int val; | 599 | int val; |
600 | 600 | ||
@@ -610,7 +610,7 @@ static int gm206_bios_preos(struct gk20a *g) | |||
610 | gk20a_dbg_fn("done"); | 610 | gk20a_dbg_fn("done"); |
611 | break; | 611 | break; |
612 | } | 612 | } |
613 | udelay(GR_IDLE_CHECK_DEFAULT); | 613 | udelay(PMU_BOOT_TIMEOUT_DEFAULT); |
614 | } while (--retries || !tegra_platform_is_silicon()); | 614 | } while (--retries || !tegra_platform_is_silicon()); |
615 | 615 | ||
616 | /* todo check retries */ | 616 | /* todo check retries */ |