diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index 67bd4b884..46f5ffb58 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -2777,6 +2777,13 @@ int gr_gv11b_init_fs_state(struct gk20a *g)
 			g->gr.fecs_feature_override_ecc_val);
 	}
 
+	/* Disable SWDX spill buffer invalidates */
+	data = gk20a_readl(g, gr_gpcs_swdx_spill_unit_r());
+	data = set_field(
+		data, gr_gpcs_swdx_spill_unit_spill_buffer_cache_mgmt_mode_m(),
+		gr_gpcs_swdx_spill_unit_spill_buffer_cache_mgmt_mode_disabled_f());
+	gk20a_writel(g, gr_gpcs_swdx_spill_unit_r(), data);
+
 	err = gr_gk20a_init_fs_state(g);
 	if (err)
 		return err;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h
index c430122db..4458265d8 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h
@@ -3840,6 +3840,22 @@ static inline u32 gr_gpcs_swdx_dss_zbc_s_01_to_04_format_r(void)
 {
 	return 0x00418198U;
 }
+static inline u32 gr_gpcs_swdx_spill_unit_r(void)
+{
+	return 0x00418e9cU;
+}
+static inline u32 gr_gpcs_swdx_spill_unit_spill_buffer_cache_mgmt_mode_m(void)
+{
+	return 0x1U << 16U;
+}
+static inline u32 gr_gpcs_swdx_spill_unit_spill_buffer_cache_mgmt_mode_disabled_f(void)
+{
+	return 0x0U;
+}
+static inline u32 gr_gpcs_swdx_spill_unit_spill_buffer_cache_mgmt_mode_enabled_f(void)
+{
+	return 0x10000U;
+}
 static inline u32 gr_gpcs_setup_attrib_cb_base_r(void)
 {
 	return 0x00418810U;