2 files changed, 6 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index ce0a6563..b677419c 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -312,6 +312,7 @@ struct gpu_ops {
                                 struct channel_gk20a *c,
                                 u64 gpu_va,
                                 u32 mode);
+                void (*init_hwpm_pmm_register)(struct gk20a *g);
                 int (*dump_gr_regs)(struct gk20a *g,
                                 struct gk20a_debug_output *o);
                 int (*update_pc_sampling)(struct channel_gk20a *ch,
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 3f49fbf7..c70c1cd4 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -1782,6 +1782,11 @@ int gr_gk20a_update_hwpm_ctxsw_mode(struct gk20a *g,
                                 return -ENOMEM;
                         }
                 }
+
+                if (mode == NVGPU_DBG_HWPM_CTXSW_MODE_STREAM_OUT_CTXSW &&
+                                g->ops.gr.init_hwpm_pmm_register) {
+                        g->ops.gr.init_hwpm_pmm_register(g);
+                }
         }
 
         data = nvgpu_mem_rd(g, gr_mem, ctxsw_prog_main_image_pm_o());