diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index f57be9dd..694ff8ad 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |||
@@ -2661,7 +2661,7 @@ void gr_gv11b_detect_sm_arch(struct gk20a *g) | |||
2661 | gr_gpc0_tpc0_sm_arch_warp_count_v(v); | 2661 | gr_gpc0_tpc0_sm_arch_warp_count_v(v); |
2662 | } | 2662 | } |
2663 | 2663 | ||
2664 | static u32 gr_gv11b_get_nonpes_aware_tpc(struct gk20a *g, u32 gpc, u32 tpc) | 2664 | u32 gr_gv11b_get_nonpes_aware_tpc(struct gk20a *g, u32 gpc, u32 tpc) |
2665 | { | 2665 | { |
2666 | u32 tpc_new = 0; | 2666 | u32 tpc_new = 0; |
2667 | u32 temp; | 2667 | u32 temp; |
@@ -2691,7 +2691,7 @@ void gr_gv11b_program_sm_id_numbering(struct gk20a *g, | |||
2691 | u32 tpc_offset = tpc_in_gpc_stride * tpc; | 2691 | u32 tpc_offset = tpc_in_gpc_stride * tpc; |
2692 | u32 global_tpc_index = g->gr.sm_to_cluster[smid].global_tpc_index; | 2692 | u32 global_tpc_index = g->gr.sm_to_cluster[smid].global_tpc_index; |
2693 | 2693 | ||
2694 | tpc = gr_gv11b_get_nonpes_aware_tpc(g, gpc, tpc); | 2694 | tpc = g->ops.gr.get_nonpes_aware_tpc(g, gpc, tpc); |
2695 | 2695 | ||
2696 | gk20a_writel(g, gr_gpc0_tpc0_sm_cfg_r() + gpc_offset + tpc_offset, | 2696 | gk20a_writel(g, gr_gpc0_tpc0_sm_cfg_r() + gpc_offset + tpc_offset, |
2697 | gr_gpc0_tpc0_sm_cfg_tpc_id_f(global_tpc_index)); | 2697 | gr_gpc0_tpc0_sm_cfg_tpc_id_f(global_tpc_index)); |
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.h b/drivers/gpu/nvgpu/gv11b/gr_gv11b.h index f6f05a3b..fb4c8b69 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.h | |||
@@ -248,4 +248,5 @@ int gr_gv11b_create_priv_addr_table(struct gk20a *g, | |||
248 | u32 addr, | 248 | u32 addr, |
249 | u32 *priv_addr_table, | 249 | u32 *priv_addr_table, |
250 | u32 *num_registers); | 250 | u32 *num_registers); |
251 | u32 gr_gv11b_get_nonpes_aware_tpc(struct gk20a *g, u32 gpc, u32 tpc); | ||
251 | #endif | 252 | #endif |
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index ce8f5051..f9ac1f2a 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -415,6 +415,7 @@ static const struct gpu_ops gv11b_ops = { | |||
415 | .alloc_global_ctx_buffers = gr_gk20a_alloc_global_ctx_buffers, | 415 | .alloc_global_ctx_buffers = gr_gk20a_alloc_global_ctx_buffers, |
416 | .map_global_ctx_buffers = gr_gk20a_map_global_ctx_buffers, | 416 | .map_global_ctx_buffers = gr_gk20a_map_global_ctx_buffers, |
417 | .commit_global_ctx_buffers = gr_gk20a_commit_global_ctx_buffers, | 417 | .commit_global_ctx_buffers = gr_gk20a_commit_global_ctx_buffers, |
418 | .get_nonpes_aware_tpc = gr_gv11b_get_nonpes_aware_tpc, | ||
418 | }, | 419 | }, |
419 | .fb = { | 420 | .fb = { |
420 | .reset = gv11b_fb_reset, | 421 | .reset = gv11b_fb_reset, |