diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-09-12 17:51:40 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-09-27 18:05:25 -0400 |
commit | e3ae03e17abd452c157545234348692364b4b9f6 (patch) | |
tree | 121b3dcde56c87f9a1008ad4f5effbeb69cff945 /drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c | |
parent | 78e3d22da3c2513d425c8c2560468ce854a982dd (diff) |
gpu: nvgpu: Add MC APIs for reset masks
Add API for querying reset mask corresponding to a unit. The reset
masks need to be read from MC HW header, and we do not want all
units to access Mc HW headers themselves.
JIRA NVGPU-954
Change-Id: I49ebbd891569de634bfc71afcecc8cd2358805c0
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1823384
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c index 00d1b196..28a3d495 100644 --- a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c | |||
@@ -34,12 +34,12 @@ | |||
34 | #include <nvgpu/io.h> | 34 | #include <nvgpu/io.h> |
35 | #include <nvgpu/utils.h> | 35 | #include <nvgpu/utils.h> |
36 | #include <nvgpu/channel.h> | 36 | #include <nvgpu/channel.h> |
37 | #include <nvgpu/unit.h> | ||
37 | 38 | ||
38 | #include "gk20a.h" | 39 | #include "gk20a.h" |
39 | #include "css_gr_gk20a.h" | 40 | #include "css_gr_gk20a.h" |
40 | 41 | ||
41 | #include <nvgpu/hw/gk20a/hw_perf_gk20a.h> | 42 | #include <nvgpu/hw/gk20a/hw_perf_gk20a.h> |
42 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | ||
43 | 43 | ||
44 | /* check client for pointed perfmon ownership */ | 44 | /* check client for pointed perfmon ownership */ |
45 | #define CONTAINS_PERFMON(cl, pm) \ | 45 | #define CONTAINS_PERFMON(cl, pm) \ |
@@ -89,7 +89,7 @@ static void css_hw_reset_streaming(struct gk20a *g) | |||
89 | u32 engine_status; | 89 | u32 engine_status; |
90 | 90 | ||
91 | /* reset the perfmon */ | 91 | /* reset the perfmon */ |
92 | g->ops.mc.reset(g, mc_enable_perfmon_enabled_f()); | 92 | g->ops.mc.reset(g, g->ops.mc.reset_mask(g, NVGPU_UNIT_PERFMON)); |
93 | 93 | ||
94 | /* RBUFEMPTY must be set -- otherwise we'll pick up */ | 94 | /* RBUFEMPTY must be set -- otherwise we'll pick up */ |
95 | /* snapshot that have been queued up from earlier */ | 95 | /* snapshot that have been queued up from earlier */ |