diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c index 1191dad3..b9278a01 100644 --- a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c | |||
@@ -37,12 +37,12 @@ | |||
37 | #include <nvgpu/utils.h> | 37 | #include <nvgpu/utils.h> |
38 | #include <nvgpu/gk20a.h> | 38 | #include <nvgpu/gk20a.h> |
39 | #include <nvgpu/channel.h> | 39 | #include <nvgpu/channel.h> |
40 | #include <nvgpu/unit.h> | ||
40 | 41 | ||
41 | #include "gk20a/css_gr_gk20a.h" | 42 | #include "gk20a/css_gr_gk20a.h" |
42 | #include "css_gr_gv11b.h" | 43 | #include "css_gr_gv11b.h" |
43 | 44 | ||
44 | #include <nvgpu/hw/gv11b/hw_perf_gv11b.h> | 45 | #include <nvgpu/hw/gv11b/hw_perf_gv11b.h> |
45 | #include <nvgpu/hw/gv11b/hw_mc_gv11b.h> | ||
46 | 46 | ||
47 | 47 | ||
48 | /* reports whether the hw queue overflowed */ | 48 | /* reports whether the hw queue overflowed */ |
@@ -65,7 +65,7 @@ static void gv11b_css_hw_reset_streaming(struct gk20a *g) | |||
65 | u32 engine_status; | 65 | u32 engine_status; |
66 | 66 | ||
67 | /* reset the perfmon */ | 67 | /* reset the perfmon */ |
68 | g->ops.mc.reset(g, mc_enable_perfmon_enabled_f()); | 68 | g->ops.mc.reset(g, g->ops.mc.reset_mask(g, NVGPU_UNIT_PERFMON)); |
69 | 69 | ||
70 | /* RBUFEMPTY must be set -- otherwise we'll pick up */ | 70 | /* RBUFEMPTY must be set -- otherwise we'll pick up */ |
71 | /* snapshot that have been queued up from earlier */ | 71 | /* snapshot that have been queued up from earlier */ |
diff --git a/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c b/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c index ec6cce55..2b2410eb 100644 --- a/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c | |||
@@ -26,10 +26,10 @@ | |||
26 | #include <nvgpu/io.h> | 26 | #include <nvgpu/io.h> |
27 | #include <nvgpu/utils.h> | 27 | #include <nvgpu/utils.h> |
28 | #include <nvgpu/gk20a.h> | 28 | #include <nvgpu/gk20a.h> |
29 | #include <nvgpu/unit.h> | ||
29 | 30 | ||
30 | #include "gv11b/dbg_gpu_gv11b.h" | 31 | #include "gv11b/dbg_gpu_gv11b.h" |
31 | #include <nvgpu/hw/gv11b/hw_perf_gv11b.h> | 32 | #include <nvgpu/hw/gv11b/hw_perf_gv11b.h> |
32 | #include <nvgpu/hw/gv11b/hw_mc_gv11b.h> | ||
33 | #include <nvgpu/bug.h> | 33 | #include <nvgpu/bug.h> |
34 | 34 | ||
35 | static void gv11b_perfbuf_reset_streaming(struct gk20a *g) | 35 | static void gv11b_perfbuf_reset_streaming(struct gk20a *g) |
@@ -37,7 +37,7 @@ static void gv11b_perfbuf_reset_streaming(struct gk20a *g) | |||
37 | u32 engine_status; | 37 | u32 engine_status; |
38 | u32 num_unread_bytes; | 38 | u32 num_unread_bytes; |
39 | 39 | ||
40 | g->ops.mc.reset(g, mc_enable_perfmon_enabled_f()); | 40 | g->ops.mc.reset(g, g->ops.mc.reset_mask(g, NVGPU_UNIT_PERFMON)); |
41 | 41 | ||
42 | engine_status = gk20a_readl(g, perf_pmasys_enginestatus_r()); | 42 | engine_status = gk20a_readl(g, perf_pmasys_enginestatus_r()); |
43 | WARN_ON(0u == | 43 | WARN_ON(0u == |
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index fa1836c8..34e9cd5f 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <nvgpu/utils.h> | 41 | #include <nvgpu/utils.h> |
42 | #include <nvgpu/gk20a.h> | 42 | #include <nvgpu/gk20a.h> |
43 | #include <nvgpu/channel.h> | 43 | #include <nvgpu/channel.h> |
44 | #include <nvgpu/unit.h> | ||
44 | 45 | ||
45 | #include "gk20a/fifo_gk20a.h" | 46 | #include "gk20a/fifo_gk20a.h" |
46 | 47 | ||
@@ -53,7 +54,6 @@ | |||
53 | #include <nvgpu/hw/gv11b/hw_usermode_gv11b.h> | 54 | #include <nvgpu/hw/gv11b/hw_usermode_gv11b.h> |
54 | #include <nvgpu/hw/gv11b/hw_top_gv11b.h> | 55 | #include <nvgpu/hw/gv11b/hw_top_gv11b.h> |
55 | #include <nvgpu/hw/gv11b/hw_gmmu_gv11b.h> | 56 | #include <nvgpu/hw/gv11b/hw_gmmu_gv11b.h> |
56 | #include <nvgpu/hw/gv11b/hw_mc_gv11b.h> | ||
57 | #include <nvgpu/hw/gv11b/hw_gr_gv11b.h> | 57 | #include <nvgpu/hw/gv11b/hw_gr_gv11b.h> |
58 | 58 | ||
59 | #include "fifo_gv11b.h" | 59 | #include "fifo_gv11b.h" |
@@ -1281,7 +1281,7 @@ int gv11b_init_fifo_reset_enable_hw(struct gk20a *g) | |||
1281 | nvgpu_log_fn(g, " "); | 1281 | nvgpu_log_fn(g, " "); |
1282 | 1282 | ||
1283 | /* enable pmc pfifo */ | 1283 | /* enable pmc pfifo */ |
1284 | g->ops.mc.reset(g, mc_enable_pfifo_enabled_f()); | 1284 | g->ops.mc.reset(g, g->ops.mc.reset_mask(g, NVGPU_UNIT_FIFO)); |
1285 | 1285 | ||
1286 | if (g->ops.clock_gating.slcg_ce2_load_gating_prod) { | 1286 | if (g->ops.clock_gating.slcg_ce2_load_gating_prod) { |
1287 | g->ops.clock_gating.slcg_ce2_load_gating_prod(g, | 1287 | g->ops.clock_gating.slcg_ce2_load_gating_prod(g, |
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index a79071b7..42969805 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -759,6 +759,8 @@ static const struct gpu_ops gv11b_ops = { | |||
759 | .is_intr_hub_pending = gv11b_mc_is_intr_hub_pending, | 759 | .is_intr_hub_pending = gv11b_mc_is_intr_hub_pending, |
760 | .is_stall_and_eng_intr_pending = | 760 | .is_stall_and_eng_intr_pending = |
761 | gv11b_mc_is_stall_and_eng_intr_pending, | 761 | gv11b_mc_is_stall_and_eng_intr_pending, |
762 | .reset_mask = gm20b_mc_reset_mask, | ||
763 | .is_enabled = gm20b_mc_is_enabled, | ||
762 | }, | 764 | }, |
763 | .debug = { | 765 | .debug = { |
764 | .show_dump = gk20a_debug_show_dump, | 766 | .show_dump = gk20a_debug_show_dump, |