From 503d489dba278136ea0e4241d000018682989da5 Mon Sep 17 00:00:00 2001 From: Vaibhav Kachore Date: Tue, 3 Jul 2018 17:21:13 +0530 Subject: gpu: nvgpu: Initialize hwpm perfmons (engine_sel) - For Mode-E ctxsw it is required that engine_sel is set to 0xFFFFFFFF. - Default 0 is a valid signal and causes problems. Bug 2106999 Change-Id: I5cdb4441a8e6d7e8133c31a9e361b54611dd2995 Signed-off-by: Vaibhav Kachore Reviewed-on: https://git-master.nvidia.com/r/1770755 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/gk20a.h | 1 + drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'drivers/gpu/nvgpu/gk20a') 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()); -- cgit v1.2.2