diff options
author | seshendra Gadagottu <sgadagottu@nvidia.com> | 2017-10-19 01:14:40 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-10-20 12:19:06 -0400 |
commit | a2c9c6ba0573bde2d4eada8a39d4e97f9749eef1 (patch) | |
tree | 5f3f98a68d0e31aee288a83a6e7006f6da3e31f3 /drivers/gpu/nvgpu/gk20a | |
parent | 58be11bbf562362e598f5c226cb48fdd19aa81d5 (diff) |
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 <sgadagottu@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1581753
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c | 5 |
1 files changed, 1 insertions, 4 deletions
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) | |||
90 | static void css_hw_reset_streaming(struct gk20a *g) | 90 | static void css_hw_reset_streaming(struct gk20a *g) |
91 | { | 91 | { |
92 | u32 engine_status; | 92 | u32 engine_status; |
93 | u32 old_pmc = gk20a_readl(g, mc_enable_r()); | ||
94 | 93 | ||
95 | /* reset the perfmon */ | 94 | /* reset the perfmon */ |
96 | gk20a_writel(g, mc_enable_r(), | 95 | g->ops.mc.reset(g, mc_enable_perfmon_enabled_f()); |
97 | old_pmc & ~mc_enable_perfmon_enabled_f()); | ||
98 | gk20a_writel(g, mc_enable_r(), old_pmc); | ||
99 | 96 | ||
100 | /* RBUFEMPTY must be set -- otherwise we'll pick up */ | 97 | /* RBUFEMPTY must be set -- otherwise we'll pick up */ |
101 | /* snapshot that have been queued up from earlier */ | 98 | /* snapshot that have been queued up from earlier */ |