diff options
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index c5f45816..61ecddef 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |||
@@ -510,7 +510,8 @@ static int gr_gp10b_alloc_gr_ctx(struct gk20a *g, | |||
510 | 510 | ||
511 | if (flags & NVGPU_ALLOC_OBJ_FLAGS_GFXP) { | 511 | if (flags & NVGPU_ALLOC_OBJ_FLAGS_GFXP) { |
512 | u32 spill_size = | 512 | u32 spill_size = |
513 | gr_gpc0_swdx_rm_spill_buffer_size_256b_default_v(); | 513 | gr_gpc0_swdx_rm_spill_buffer_size_256b_default_v() * |
514 | gr_gpc0_swdx_rm_spill_buffer_size_256b_byte_granularity_v(); | ||
514 | u32 pagepool_size = g->ops.gr.pagepool_default_size(g) * | 515 | u32 pagepool_size = g->ops.gr.pagepool_default_size(g) * |
515 | gr_scc_pagepool_total_pages_byte_granularity_v(); | 516 | gr_scc_pagepool_total_pages_byte_granularity_v(); |
516 | u32 betacb_size = g->gr.attrib_cb_default_size + | 517 | u32 betacb_size = g->gr.attrib_cb_default_size + |
@@ -694,7 +695,8 @@ static void gr_gp10b_update_ctxsw_preemption_mode(struct gk20a *g, | |||
694 | gr_gpc0_swdx_rm_spill_buffer_addr_39_8_align_bits_v()) | | 695 | gr_gpc0_swdx_rm_spill_buffer_addr_39_8_align_bits_v()) | |
695 | (u64_hi32(gr_ctx->t18x.spill_ctxsw_buffer.gpu_va) << | 696 | (u64_hi32(gr_ctx->t18x.spill_ctxsw_buffer.gpu_va) << |
696 | (32 - gr_gpc0_swdx_rm_spill_buffer_addr_39_8_align_bits_v())); | 697 | (32 - gr_gpc0_swdx_rm_spill_buffer_addr_39_8_align_bits_v())); |
697 | size = gr_ctx->t18x.spill_ctxsw_buffer.size; | 698 | size = gr_ctx->t18x.spill_ctxsw_buffer.size / |
699 | gr_gpc0_swdx_rm_spill_buffer_size_256b_byte_granularity_v(); | ||
698 | 700 | ||
699 | gr_gk20a_ctx_patch_write(g, ch_ctx, | 701 | gr_gk20a_ctx_patch_write(g, ch_ctx, |
700 | gr_gpc0_swdx_rm_spill_buffer_addr_r(), | 702 | gr_gpc0_swdx_rm_spill_buffer_addr_r(), |
diff --git a/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h b/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h index e33f0734..0aa68fa2 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h | |||
@@ -2510,6 +2510,10 @@ static inline u32 gr_gpc0_swdx_rm_spill_buffer_size_256b_default_v(void) | |||
2510 | { | 2510 | { |
2511 | return 0x00000250; | 2511 | return 0x00000250; |
2512 | } | 2512 | } |
2513 | static inline u32 gr_gpc0_swdx_rm_spill_buffer_size_256b_byte_granularity_v(void) | ||
2514 | { | ||
2515 | return 0x00000100; | ||
2516 | } | ||
2513 | static inline u32 gr_gpc0_swdx_rm_spill_buffer_addr_r(void) | 2517 | static inline u32 gr_gpc0_swdx_rm_spill_buffer_addr_r(void) |
2514 | { | 2518 | { |
2515 | return 0x00500ee0; | 2519 | return 0x00500ee0; |