From a2c9c6ba0573bde2d4eada8a39d4e97f9749eef1 Mon Sep 17 00:00:00 2001 From: seshendra Gadagottu Date: Wed, 18 Oct 2017 22:14:40 -0700 Subject: gpu: nvgpu: reset perfmon correctly Use mc reset HAL function to reset perfmon unit. This will take care of delays after writing to mc_enable register. Change-Id: I6118bdd2a9fc9192f7ffc44617a170b7982c26ba Signed-off-by: seshendra Gadagottu Reviewed-on: https://git-master.nvidia.com/r/1581753 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c index 366c7cb7..725ae278 100644 --- a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c @@ -90,12 +90,9 @@ inline void css_hw_set_handled_snapshots(struct gk20a *g, u32 done) static void css_hw_reset_streaming(struct gk20a *g) { u32 engine_status; - u32 old_pmc = gk20a_readl(g, mc_enable_r()); /* reset the perfmon */ - gk20a_writel(g, mc_enable_r(), - old_pmc & ~mc_enable_perfmon_enabled_f()); - gk20a_writel(g, mc_enable_r(), old_pmc); + g->ops.mc.reset(g, mc_enable_perfmon_enabled_f()); /* RBUFEMPTY must be set -- otherwise we'll pick up */ /* snapshot that have been queued up from earlier */ -- cgit v1.2.2