gpu: nvgpu: gp10b: Disable RE suppression

Bug 1642669

Change-Id: I683338256b7f2a165a7933aa59de510eb109ea6f
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/755150
Reviewed-by: Automatic_Commit_Validation_User

2 files changed, 21 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index 265cad66..1942b1e7 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -916,6 +916,11 @@ static int gr_gp10b_init_fs_state(struct gk20a *g)
                         gr_gpcs_tpcs_sm_texio_control_oor_addr_check_mode_arm_63_48_match_f());
         gk20a_writel(g, gr_gpcs_tpcs_sm_texio_control_r(), data);
 
+        data = gk20a_readl(g, gr_gpcs_tpcs_sm_disp_ctrl_r());
+        data = set_field(data, gr_gpcs_tpcs_sm_disp_ctrl_re_suppress_m(),
+                         gr_gpcs_tpcs_sm_disp_ctrl_re_suppress_disable_f());
+        gk20a_writel(g, gr_gpcs_tpcs_sm_disp_ctrl_r(), data);
+
         return gr_gm20b_ctx_state_floorsweep(g);
 }
 
diff --git a/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h b/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h
index 54d21eb3..6e4f7d1a 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h
+++ b/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h
@@ -3766,8 +3766,24 @@ static inline u32 gr_gpcs_tpcs_sm_texio_control_oor_addr_check_mode_f(u32 v)
 {
         return (v & 0x7) << 8;
 }
+static inline u32 gr_gpcs_tpcs_sm_texio_control_oor_addr_check_mode_m(void)
+{
+        return 0x7 << 8;
+}
 static inline u32 gr_gpcs_tpcs_sm_texio_control_oor_addr_check_mode_arm_63_48_match_f(void)
 {
         return 0x100;
 }
+static inline u32 gr_gpcs_tpcs_sm_disp_ctrl_r(void)
+{
+        return 0x00419f78;
+}
+static inline u32 gr_gpcs_tpcs_sm_disp_ctrl_re_suppress_m(void)
+{
+        return 0x3 << 11;
+}
+static inline u32 gr_gpcs_tpcs_sm_disp_ctrl_re_suppress_disable_f(void)
+{
+        return 0x1000;
+}
 #endif