From bf9f5f82d185469558cefcdc9159ead09114251f Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 19 Nov 2014 15:14:44 +0200 Subject: gpu: nvgpu: Use driver-wide timeout for ACR boot In simulation we disable timeouts system-wide. Use the system-wide timeout for ACR boot to enable ACR boot in simulation. Bug 1546850 Change-Id: I58fc0485725195feab24ae5fe4f249116668bbcc Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/606273 --- drivers/gpu/nvgpu/gm20b/acr_gm20b.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'drivers/gpu') diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c index cb874a48..7c6b734b 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c @@ -29,7 +29,6 @@ /*Defines*/ #define gm20b_dbg_pmu(fmt, arg...) \ gk20a_dbg(gpu_dbg_pmu, fmt, ##arg) -#define GPU_TIMEOUT_DEFAULT 10000 typedef int (*get_ucode_details)(struct gk20a *g, struct flcn_ucode_img *udata); @@ -1275,7 +1274,7 @@ int pmu_exec_gen_bl(struct gk20a *g, void *desc, u8 b_wait_for_halt) * to PMU halt */ - if (clear_halt_interrupt_status(g, GPU_TIMEOUT_DEFAULT)) + if (clear_halt_interrupt_status(g, gk20a_get_gr_idle_timeout(g))) goto err_unmap_bl; gm20b_dbg_pmu("err reg :%x\n", readl(mc + @@ -1287,10 +1286,10 @@ int pmu_exec_gen_bl(struct gk20a *g, void *desc, u8 b_wait_for_halt) gm20b_init_pmu_setup_hw1(g, desc, acr->hsbl_ucode.size); /* Poll for HALT */ if (b_wait_for_halt) { - err = pmu_wait_for_halt(g, GPU_TIMEOUT_DEFAULT); + err = pmu_wait_for_halt(g, gk20a_get_gr_idle_timeout(g)); if (err == 0) { /* Clear the HALT interrupt */ - if (clear_halt_interrupt_status(g, GPU_TIMEOUT_DEFAULT)) + if (clear_halt_interrupt_status(g, gk20a_get_gr_idle_timeout(g))) goto err_unmap_bl; } else -- cgit v1.2.2