diff options
author | Mahantesh Kumbar <mkumbar@nvidia.com> | 2017-04-25 06:29:21 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-05-03 02:36:07 -0400 |
commit | abbc687a31de4ebd53bd5a05889d31d3b090969c (patch) | |
tree | df81319ca2f5a077e7482ec0b059622e9a69008f | |
parent | 940cd280e15a206d51ceaf42d407fa4b96f40c9a (diff) |
gpu: nvgpu: init interface layer support for PMU falcon
Change-Id: I210267265fa38777115d5b49cc8f78f2599e3f9e
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: http://git-master/r/1469458
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 9dca86fb..51b0ba11 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -241,6 +241,9 @@ int gk20a_finalize_poweron(struct gk20a *g) | |||
241 | goto done; | 241 | goto done; |
242 | } | 242 | } |
243 | 243 | ||
244 | /* init interface layer support for PMU falcon */ | ||
245 | nvgpu_flcn_sw_init(g, FALCON_ID_PMU); | ||
246 | |||
244 | if (g->ops.pmu.is_pmu_supported(g)) { | 247 | if (g->ops.pmu.is_pmu_supported(g)) { |
245 | if (g->ops.pmu.prepare_ucode) | 248 | if (g->ops.pmu.prepare_ucode) |
246 | err = g->ops.pmu.prepare_ucode(g); | 249 | err = g->ops.pmu.prepare_ucode(g); |
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index c190a83c..62cd6119 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include "gk20a/dbg_gpu_gk20a.h" | 17 | #include "gk20a/dbg_gpu_gk20a.h" |
18 | #include "gk20a/css_gr_gk20a.h" | 18 | #include "gk20a/css_gr_gk20a.h" |
19 | #include "gk20a/bus_gk20a.h" | 19 | #include "gk20a/bus_gk20a.h" |
20 | #include "gk20a/flcn_gk20a.h" | ||
20 | 21 | ||
21 | #include "ltc_gm20b.h" | 22 | #include "ltc_gm20b.h" |
22 | #include "ce2_gm20b.h" | 23 | #include "ce2_gm20b.h" |
@@ -225,6 +226,7 @@ int gm20b_init_hal(struct gk20a *g) | |||
225 | gm20b_init_ce2(gops); | 226 | gm20b_init_ce2(gops); |
226 | gm20b_init_gr_ctx(gops); | 227 | gm20b_init_gr_ctx(gops); |
227 | gm20b_init_mm(gops); | 228 | gm20b_init_mm(gops); |
229 | gk20a_falcon_init_hal(gops); | ||
228 | gm20b_init_pmu_ops(gops); | 230 | gm20b_init_pmu_ops(gops); |
229 | gm20b_init_clk_ops(gops); | 231 | gm20b_init_clk_ops(gops); |
230 | gm20b_init_regops(gops); | 232 | gm20b_init_regops(gops); |
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 8f72522f..e39843ac 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include "gk20a/css_gr_gk20a.h" | 18 | #include "gk20a/css_gr_gk20a.h" |
19 | #include "gk20a/bus_gk20a.h" | 19 | #include "gk20a/bus_gk20a.h" |
20 | #include "gk20a/pramin_gk20a.h" | 20 | #include "gk20a/pramin_gk20a.h" |
21 | #include "gk20a/flcn_gk20a.h" | ||
21 | 22 | ||
22 | #include "gp10b/gr_gp10b.h" | 23 | #include "gp10b/gr_gp10b.h" |
23 | #include "gp10b/fecs_trace_gp10b.h" | 24 | #include "gp10b/fecs_trace_gp10b.h" |
@@ -239,6 +240,7 @@ int gp106_init_hal(struct gk20a *g) | |||
239 | gp10b_init_ce(gops); | 240 | gp10b_init_ce(gops); |
240 | gp106_init_gr_ctx(gops); | 241 | gp106_init_gr_ctx(gops); |
241 | gp106_init_mm(gops); | 242 | gp106_init_mm(gops); |
243 | gk20a_falcon_init_hal(gops); | ||
242 | gp106_init_pmu_ops(gops); | 244 | gp106_init_pmu_ops(gops); |
243 | gk20a_init_debug_ops(gops); | 245 | gk20a_init_debug_ops(gops); |
244 | gk20a_init_dbg_session_ops(gops); | 246 | gk20a_init_dbg_session_ops(gops); |
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 0332897e..e8cd6a71 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include "gk20a/css_gr_gk20a.h" | 18 | #include "gk20a/css_gr_gk20a.h" |
19 | #include "gk20a/bus_gk20a.h" | 19 | #include "gk20a/bus_gk20a.h" |
20 | #include "gk20a/pramin_gk20a.h" | 20 | #include "gk20a/pramin_gk20a.h" |
21 | #include "gk20a/flcn_gk20a.h" | ||
21 | 22 | ||
22 | #include "gp10b/gr_gp10b.h" | 23 | #include "gp10b/gr_gp10b.h" |
23 | #include "gp10b/fecs_trace_gp10b.h" | 24 | #include "gp10b/fecs_trace_gp10b.h" |
@@ -240,6 +241,7 @@ int gp10b_init_hal(struct gk20a *g) | |||
240 | gp10b_init_ce(gops); | 241 | gp10b_init_ce(gops); |
241 | gp10b_init_gr_ctx(gops); | 242 | gp10b_init_gr_ctx(gops); |
242 | gp10b_init_mm(gops); | 243 | gp10b_init_mm(gops); |
244 | gk20a_falcon_init_hal(gops); | ||
243 | gp10b_init_pmu_ops(gops); | 245 | gp10b_init_pmu_ops(gops); |
244 | gk20a_init_debug_ops(gops); | 246 | gk20a_init_debug_ops(gops); |
245 | gk20a_init_dbg_session_ops(gops); | 247 | gk20a_init_dbg_session_ops(gops); |