diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c')
| -rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index f47d3b12..57cd266d 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
| @@ -1596,8 +1596,10 @@ static int gr_gk20a_init_golden_ctx_image(struct gk20a *g, | |||
| 1596 | if (!g->is_fmodel) { | 1596 | if (!g->is_fmodel) { |
| 1597 | struct nvgpu_timeout timeout; | 1597 | struct nvgpu_timeout timeout; |
| 1598 | 1598 | ||
| 1599 | nvgpu_timeout_init(g, &timeout, FE_PWR_MODE_TIMEOUT_MAX / 1000, | 1599 | nvgpu_timeout_init(g, &timeout, |
| 1600 | NVGPU_TIMER_CPU_TIMER); | 1600 | FE_PWR_MODE_TIMEOUT_MAX / |
| 1601 | FE_PWR_MODE_TIMEOUT_DEFAULT, | ||
| 1602 | NVGPU_TIMER_RETRY_TIMER); | ||
| 1601 | gk20a_writel(g, gr_fe_pwr_mode_r(), | 1603 | gk20a_writel(g, gr_fe_pwr_mode_r(), |
| 1602 | gr_fe_pwr_mode_req_send_f() | gr_fe_pwr_mode_mode_force_on_f()); | 1604 | gr_fe_pwr_mode_req_send_f() | gr_fe_pwr_mode_mode_force_on_f()); |
| 1603 | do { | 1605 | do { |
| @@ -1639,8 +1641,10 @@ static int gr_gk20a_init_golden_ctx_image(struct gk20a *g, | |||
| 1639 | if (!g->is_fmodel) { | 1641 | if (!g->is_fmodel) { |
| 1640 | struct nvgpu_timeout timeout; | 1642 | struct nvgpu_timeout timeout; |
| 1641 | 1643 | ||
| 1642 | nvgpu_timeout_init(g, &timeout, FE_PWR_MODE_TIMEOUT_MAX / 1000, | 1644 | nvgpu_timeout_init(g, &timeout, |
| 1643 | NVGPU_TIMER_CPU_TIMER); | 1645 | FE_PWR_MODE_TIMEOUT_MAX / |
| 1646 | FE_PWR_MODE_TIMEOUT_DEFAULT, | ||
| 1647 | NVGPU_TIMER_RETRY_TIMER); | ||
| 1644 | gk20a_writel(g, gr_fe_pwr_mode_r(), | 1648 | gk20a_writel(g, gr_fe_pwr_mode_r(), |
| 1645 | gr_fe_pwr_mode_req_send_f() | gr_fe_pwr_mode_mode_auto_f()); | 1649 | gr_fe_pwr_mode_req_send_f() | gr_fe_pwr_mode_mode_auto_f()); |
| 1646 | 1650 | ||
| @@ -4998,8 +5002,10 @@ static int gr_gk20a_wait_mem_scrubbing(struct gk20a *g) | |||
| 4998 | 5002 | ||
| 4999 | gk20a_dbg_fn(""); | 5003 | gk20a_dbg_fn(""); |
| 5000 | 5004 | ||
| 5001 | nvgpu_timeout_init(g, &timeout, CTXSW_MEM_SCRUBBING_TIMEOUT_MAX / 1000, | 5005 | nvgpu_timeout_init(g, &timeout, |
| 5002 | NVGPU_TIMER_CPU_TIMER); | 5006 | CTXSW_MEM_SCRUBBING_TIMEOUT_MAX / |
| 5007 | CTXSW_MEM_SCRUBBING_TIMEOUT_DEFAULT, | ||
| 5008 | NVGPU_TIMER_RETRY_TIMER); | ||
| 5003 | do { | 5009 | do { |
| 5004 | fecs_scrubbing = gk20a_readl(g, gr_fecs_dmactl_r()) & | 5010 | fecs_scrubbing = gk20a_readl(g, gr_fecs_dmactl_r()) & |
| 5005 | (gr_fecs_dmactl_imem_scrubbing_m() | | 5011 | (gr_fecs_dmactl_imem_scrubbing_m() | |