diff options
author | Mahantesh Kumbar <mkumbar@nvidia.com> | 2017-06-15 12:40:43 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-23 04:14:23 -0400 |
commit | 94cb4b635fba4c01b58f36a6d3384db729e4c9f6 (patch) | |
tree | faa4d026519d04005204c172f1b708e5c1188ab2 /drivers/gpu/nvgpu/gm20b | |
parent | be04b9b1b56d6dd478fe521277c079367c03f39d (diff) |
gpu: nvgpu: use nvgpu_flcn_* interfaces
- set nvgpu_flcn_reset() to point to gk20a_pmu_reset()
- set PMU interrupt using nvgpu_flcn_enable_irq()
- replace pmu_idle with nvgpu_flcn_wait_idle()
JIRA NVGPU-57
Change-Id: I50d0310ae78ad266da3c1e662f1598d61ff7abb6
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: http://git-master/r/1469478
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/acr_gm20b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/pmu_gm20b.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c index 02da3de9..43df8f24 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c | |||
@@ -1291,7 +1291,7 @@ int gm20b_init_nspmu_setup_hw1(struct gk20a *g) | |||
1291 | gk20a_dbg_fn(""); | 1291 | gk20a_dbg_fn(""); |
1292 | 1292 | ||
1293 | nvgpu_mutex_acquire(&pmu->isr_mutex); | 1293 | nvgpu_mutex_acquire(&pmu->isr_mutex); |
1294 | g->ops.pmu.reset(g); | 1294 | nvgpu_flcn_reset(pmu->flcn); |
1295 | pmu->isr_enabled = true; | 1295 | pmu->isr_enabled = true; |
1296 | nvgpu_mutex_release(&pmu->isr_mutex); | 1296 | nvgpu_mutex_release(&pmu->isr_mutex); |
1297 | 1297 | ||
@@ -1326,7 +1326,7 @@ static int gm20b_init_pmu_setup_hw1(struct gk20a *g, | |||
1326 | gk20a_dbg_fn(""); | 1326 | gk20a_dbg_fn(""); |
1327 | 1327 | ||
1328 | nvgpu_mutex_acquire(&pmu->isr_mutex); | 1328 | nvgpu_mutex_acquire(&pmu->isr_mutex); |
1329 | g->ops.pmu.reset(g); | 1329 | nvgpu_flcn_reset(pmu->flcn); |
1330 | pmu->isr_enabled = true; | 1330 | pmu->isr_enabled = true; |
1331 | nvgpu_mutex_release(&pmu->isr_mutex); | 1331 | nvgpu_mutex_release(&pmu->isr_mutex); |
1332 | 1332 | ||
diff --git a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c index 5609a8cc..b486acfd 100644 --- a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c | |||
@@ -310,5 +310,5 @@ void gm20b_init_pmu_ops(struct gpu_ops *gops) | |||
310 | gops->pmu.pmu_pg_param_post_init = NULL; | 310 | gops->pmu.pmu_pg_param_post_init = NULL; |
311 | gops->pmu.send_lrf_tex_ltc_dram_overide_en_dis_cmd = NULL; | 311 | gops->pmu.send_lrf_tex_ltc_dram_overide_en_dis_cmd = NULL; |
312 | gops->pmu.dump_secure_fuses = pmu_dump_security_fuses_gm20b; | 312 | gops->pmu.dump_secure_fuses = pmu_dump_security_fuses_gm20b; |
313 | gops->pmu.reset = gk20a_pmu_reset; | 313 | gops->pmu.reset = NULL; |
314 | } | 314 | } |