3 files changed, 7 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index 060cc9fb..813b8891 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -2361,8 +2361,6 @@ int gr_gp10b_init_preemption_state(struct gk20a *g)
                         gr_debug_2_gfxp_wfi_always_injects_wfi_enabled_f());
         gk20a_writel(g, gr_debug_2_r(), debug_2);
 
-        g->gr.czf_bypass = gr_gpc0_prop_debug1_czf_bypass_init_v();
-
         return 0;
 }
 
@@ -2376,6 +2374,11 @@ void gr_gp10b_set_preemption_buffer_va(struct gk20a *g,
 
 }
 
+void gr_gp10b_init_czf_bypass(struct gk20a *g)
+{
+        g->gr.czf_bypass = gr_gpc0_prop_debug1_czf_bypass_init_v();
+}
+
 int gr_gp10b_set_czf_bypass(struct gk20a *g, struct channel_gk20a *ch)
 {
         struct nvgpu_dbg_gpu_reg_op ops;
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.h b/drivers/gpu/nvgpu/gp10b/gr_gp10b.h
index 6ae4789a..9ddc0375 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.h
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.h
@@ -143,6 +143,7 @@ int gr_gp10b_init_preemption_state(struct gk20a *g);
 void gr_gp10b_set_preemption_buffer_va(struct gk20a *g,
                         struct nvgpu_mem *mem, u64 gpu_va);
 int gr_gp10b_set_czf_bypass(struct gk20a *g, struct channel_gk20a *ch);
+void gr_gp10b_init_czf_bypass(struct gk20a *g);
 void gr_gp10b_init_ctxsw_hdr_data(struct gk20a *g, struct nvgpu_mem *mem);
 
 struct gr_t18x {
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index a10df740..98e143f0 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -303,6 +303,7 @@ static const struct gpu_ops gp10b_ops = {
                 .set_boosted_ctx = gr_gp10b_set_boosted_ctx,
                 .set_preemption_mode = gr_gp10b_set_preemption_mode,
                 .set_czf_bypass = gr_gp10b_set_czf_bypass,
+                .init_czf_bypass = gr_gp10b_init_czf_bypass,
                 .pre_process_sm_exception = gr_gp10b_pre_process_sm_exception,
                 .set_preemption_buffer_va = gr_gp10b_set_preemption_buffer_va,
                 .init_preemption_state = gr_gp10b_init_preemption_state,