gpu: nvgpu: gv11b: Skip disabling vdc_4to2

gr_gv11b_init_fs_state() calls gr_gm20b_init_fs_state() which
disables vdc_4to2. This should no longer be done on gv11b, so
instead of calling gr_gm20b_init_fs_state() copy the relevant
lines to gr_gv11b_init_fs_state() and drop vdc_4to2 disable.

gv11b_ltc_init_fs_state() also disables it to match the state.
Remove that disable, too.

Change-Id: I3a3fd87a3e8836e495cb818570c971b3d29a6dd1
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1619966
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Seema Khowala <seemaj@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: Wei Sun <wsun@nvidia.com>
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>

1 files changed, 15 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index 8514cc1e..8d8f56f6 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -2382,6 +2382,7 @@ void gr_gv11b_set_preemption_buffer_va(struct gk20a *g,
 int gr_gv11b_init_fs_state(struct gk20a *g)
 {
         u32 data;
+        int err;
 
         gk20a_dbg_fn("");
 
@@ -2401,7 +2402,20 @@ int gr_gv11b_init_fs_state(struct gk20a *g)
                         g->gr.fecs_feature_override_ecc_val);
         }
 
-        return gr_gm20b_init_fs_state(g);
+        err = gr_gk20a_init_fs_state(g);
+        if (err)
+                return err;
+
+        g->ops.gr.load_tpc_mask(g);
+
+        gk20a_writel(g, gr_bes_zrop_settings_r(),
+                     gr_bes_zrop_settings_num_active_ltcs_f(g->ltc_count));
+        gk20a_writel(g, gr_bes_crop_settings_r(),
+                     gr_bes_crop_settings_num_active_ltcs_f(g->ltc_count));
+
+        g->ops.gr.load_smid_config(g);
+
+        return err;
 }
 
 void gv11b_gr_get_esr_sm_sel(struct gk20a *g, u32 gpc, u32 tpc,