diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index c5f458160..61ecddef7 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,
 
 	if (flags & NVGPU_ALLOC_OBJ_FLAGS_GFXP) {
 		u32 spill_size =
-			gr_gpc0_swdx_rm_spill_buffer_size_256b_default_v();
+			gr_gpc0_swdx_rm_spill_buffer_size_256b_default_v() *
+			gr_gpc0_swdx_rm_spill_buffer_size_256b_byte_granularity_v();
 		u32 pagepool_size = g->ops.gr.pagepool_default_size(g) *
 			gr_scc_pagepool_total_pages_byte_granularity_v();
 		u32 betacb_size = g->gr.attrib_cb_default_size +
@@ -694,7 +695,8 @@ static void gr_gp10b_update_ctxsw_preemption_mode(struct gk20a *g,
 			gr_gpc0_swdx_rm_spill_buffer_addr_39_8_align_bits_v()) |
 			(u64_hi32(gr_ctx->t18x.spill_ctxsw_buffer.gpu_va) <<
 			 (32 - gr_gpc0_swdx_rm_spill_buffer_addr_39_8_align_bits_v()));
-		size = gr_ctx->t18x.spill_ctxsw_buffer.size;
+		size = gr_ctx->t18x.spill_ctxsw_buffer.size /
+			gr_gpc0_swdx_rm_spill_buffer_size_256b_byte_granularity_v();
 
 		gr_gk20a_ctx_patch_write(g, ch_ctx,
 				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 e33f07342..0aa68fa25 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)
 {
 	return 0x00000250;
 }
+static inline u32 gr_gpc0_swdx_rm_spill_buffer_size_256b_byte_granularity_v(void)
+{
+	return 0x00000100;
+}
 static inline u32 gr_gpc0_swdx_rm_spill_buffer_addr_r(void)
 {
 	return 0x00500ee0;