diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 2fd6f72c..71fe44a3 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -78,6 +78,7 @@ | |||
78 | #define CTXSW_MEM_SCRUBBING_TIMEOUT_DEFAULT 10 | 78 | #define CTXSW_MEM_SCRUBBING_TIMEOUT_DEFAULT 10 |
79 | #define FECS_ARB_CMD_TIMEOUT_MAX 40 | 79 | #define FECS_ARB_CMD_TIMEOUT_MAX 40 |
80 | #define FECS_ARB_CMD_TIMEOUT_DEFAULT 2 | 80 | #define FECS_ARB_CMD_TIMEOUT_DEFAULT 2 |
81 | #define GFXP_WFI_TIMEOUT_COUNT_DEFAULT 100000 | ||
81 | 82 | ||
82 | static int gk20a_init_gr_bind_fecs_elpg(struct gk20a *g); | 83 | static int gk20a_init_gr_bind_fecs_elpg(struct gk20a *g); |
83 | 84 | ||
@@ -4841,6 +4842,8 @@ static int gk20a_init_gr_setup_sw(struct gk20a *g) | |||
4841 | if (g->ops.gr.init_czf_bypass) | 4842 | if (g->ops.gr.init_czf_bypass) |
4842 | g->ops.gr.init_czf_bypass(g); | 4843 | g->ops.gr.init_czf_bypass(g); |
4843 | 4844 | ||
4845 | gr->gfxp_wfi_timeout_count = GFXP_WFI_TIMEOUT_COUNT_DEFAULT; | ||
4846 | |||
4844 | nvgpu_mutex_init(&gr->ctx_mutex); | 4847 | nvgpu_mutex_init(&gr->ctx_mutex); |
4845 | nvgpu_spinlock_init(&gr->ch_tlb_lock); | 4848 | nvgpu_spinlock_init(&gr->ch_tlb_lock); |
4846 | 4849 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h index 22fc40d1..0a685d01 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h | |||
@@ -343,6 +343,7 @@ struct gr_gk20a { | |||
343 | u32 timeslice_mode; | 343 | u32 timeslice_mode; |
344 | u32 czf_bypass; | 344 | u32 czf_bypass; |
345 | u32 pd_max_batches; | 345 | u32 pd_max_batches; |
346 | u32 gfxp_wfi_timeout_count; | ||
346 | 347 | ||
347 | struct gr_ctx_buffer_desc global_ctx_buffer[NR_GLOBAL_CTX_BUF]; | 348 | struct gr_ctx_buffer_desc global_ctx_buffer[NR_GLOBAL_CTX_BUF]; |
348 | 349 | ||