3 files changed, 42 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index f2397108..9d6d8d05 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -54,6 +54,8 @@
 #include <nvgpu/hw/gv11b/hw_therm_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_fb_gv11b.h>
 
+#define GFXP_WFI_TIMEOUT_COUNT_IN_USEC_DEFAULT 1000
+
 bool gr_gv11b_is_valid_class(struct gk20a *g, u32 class_num)
 {
         bool valid = false;
@@ -3625,3 +3627,35 @@ void gr_gv11b_init_gpc_mmu(struct gk20a *g)
         gk20a_writel(g, gr_gpcs_pri_mmu_debug_rd_r(),
                         gk20a_readl(g, fb_mmu_debug_rd_r()));
 }
+
+int gr_gv11b_init_preemption_state(struct gk20a *g)
+{
+        u32 debug_2;
+        struct gr_gk20a *gr = &g->gr;
+
+        nvgpu_log_fn(g, " ");
+
+        gk20a_writel(g, gr_fe_gfxp_wfi_timeout_r(),
+                        gr_fe_gfxp_wfi_timeout_count_f(
+                        gr->gfxp_wfi_timeout_count));
+
+        debug_2 = gk20a_readl(g, gr_debug_2_r());
+        debug_2 = set_field(debug_2,
+                        gr_debug_2_gfxp_wfi_timeout_unit_m(),
+                        gr_debug_2_gfxp_wfi_timeout_unit_usec_f());
+        gk20a_writel(g, gr_debug_2_r(), debug_2);
+
+        return 0;
+}
+void gr_gv11b_init_gfxp_wfi_timeout_count(struct gk20a *g)
+{
+        struct gr_gk20a *gr = &g->gr;
+
+        gr->gfxp_wfi_timeout_count = GFXP_WFI_TIMEOUT_COUNT_IN_USEC_DEFAULT;
+}
+
+unsigned long gr_gv11b_get_max_gfxp_wfi_timeout_count(struct gk20a *g)
+{
+        /* 100 msec in usec count */
+        return (100 * 1000UL);
+}
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.h b/drivers/gpu/nvgpu/gv11b/gr_gv11b.h
index 1941f239..7c56f62d 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.h
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.h
@@ -213,5 +213,8 @@ void gv11b_gr_egpc_etpc_priv_addr_table(struct gk20a *g, u32 addr,
                  u32 gpc, u32 broadcast_flags, u32 *priv_addr_table, u32 *t);
 u32 gv11b_gr_get_egpc_base(struct gk20a *g);
 void gr_gv11b_init_gpc_mmu(struct gk20a *g);
+int gr_gv11b_init_preemption_state(struct gk20a *g);
+void gr_gv11b_init_gfxp_wfi_timeout_count(struct gk20a *g);
+unsigned long gr_gv11b_get_max_gfxp_wfi_timeout_count(struct gk20a *g);
 
 #endif
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index 5649d758..e6cf0e62 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -361,7 +361,7 @@ static const struct gpu_ops gv11b_ops = {
                 .set_czf_bypass = NULL,
                 .pre_process_sm_exception = gr_gv11b_pre_process_sm_exception,
                 .set_preemption_buffer_va = gr_gv11b_set_preemption_buffer_va,
-                .init_preemption_state = NULL,
+                .init_preemption_state = gr_gv11b_init_preemption_state,
                 .update_boosted_ctx = gr_gp10b_update_boosted_ctx,
                 .set_bes_crop_debug3 = gr_gp10b_set_bes_crop_debug3,
                 .create_gr_sysfs = gr_gv11b_create_sysfs,
@@ -388,6 +388,10 @@ static const struct gpu_ops gv11b_ops = {
                         gr_gv11b_handle_tpc_sm_ecc_exception,
                 .decode_egpc_addr = gv11b_gr_decode_egpc_addr,
                 .init_ctxsw_hdr_data = gr_gp10b_init_ctxsw_hdr_data,
+                .init_gfxp_wfi_timeout_count =
+                                gr_gv11b_init_gfxp_wfi_timeout_count,
+                .get_max_gfxp_wfi_timeout_count =
+                        gr_gv11b_get_max_gfxp_wfi_timeout_count,
         },
         .fb = {
                 .reset = gv11b_fb_reset,