diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 8f3900a1..a361648f 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -433,7 +433,9 @@ struct gpu_ops { | |||
433 | void (*disable_rd_coalesce)(struct gk20a *g); | 433 | void (*disable_rd_coalesce)(struct gk20a *g); |
434 | void (*init_ctxsw_hdr_data)(struct gk20a *g, | 434 | void (*init_ctxsw_hdr_data)(struct gk20a *g, |
435 | struct nvgpu_mem *mem); | 435 | struct nvgpu_mem *mem); |
436 | 436 | void (*init_gfxp_wfi_timeout_count)(struct gk20a *g); | |
437 | unsigned long (*get_max_gfxp_wfi_timeout_count) | ||
438 | (struct gk20a *g); | ||
437 | } gr; | 439 | } gr; |
438 | struct { | 440 | struct { |
439 | void (*init_hw)(struct gk20a *g); | 441 | void (*init_hw)(struct gk20a *g); |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 64b54699..73b49927 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -79,7 +79,6 @@ | |||
79 | #define CTXSW_MEM_SCRUBBING_TIMEOUT_DEFAULT 10 | 79 | #define CTXSW_MEM_SCRUBBING_TIMEOUT_DEFAULT 10 |
80 | #define FECS_ARB_CMD_TIMEOUT_MAX 40 | 80 | #define FECS_ARB_CMD_TIMEOUT_MAX 40 |
81 | #define FECS_ARB_CMD_TIMEOUT_DEFAULT 2 | 81 | #define FECS_ARB_CMD_TIMEOUT_DEFAULT 2 |
82 | #define GFXP_WFI_TIMEOUT_COUNT_DEFAULT 100000 | ||
83 | 82 | ||
84 | static int gk20a_init_gr_bind_fecs_elpg(struct gk20a *g); | 83 | static int gk20a_init_gr_bind_fecs_elpg(struct gk20a *g); |
85 | 84 | ||
@@ -4840,7 +4839,8 @@ static int gk20a_init_gr_setup_sw(struct gk20a *g) | |||
4840 | if (g->ops.gr.init_czf_bypass) | 4839 | if (g->ops.gr.init_czf_bypass) |
4841 | g->ops.gr.init_czf_bypass(g); | 4840 | g->ops.gr.init_czf_bypass(g); |
4842 | 4841 | ||
4843 | gr->gfxp_wfi_timeout_count = GFXP_WFI_TIMEOUT_COUNT_DEFAULT; | 4842 | if (g->ops.gr.init_gfxp_wfi_timeout_count) |
4843 | g->ops.gr.init_gfxp_wfi_timeout_count(g); | ||
4844 | 4844 | ||
4845 | nvgpu_mutex_init(&gr->ctx_mutex); | 4845 | nvgpu_mutex_init(&gr->ctx_mutex); |
4846 | nvgpu_spinlock_init(&gr->ch_tlb_lock); | 4846 | nvgpu_spinlock_init(&gr->ch_tlb_lock); |