diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/acr_gv11b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c index a6bbaa40..e27c1760 100644 --- a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include "gk20a/gk20a.h" | 37 | #include "gk20a/gk20a.h" |
38 | #include "acr_gv11b.h" | 38 | #include "acr_gv11b.h" |
39 | #include "pmu_gv11b.h" | 39 | #include "pmu_gv11b.h" |
40 | #include "gk20a/pmu_gk20a.h" | ||
41 | #include "gm20b/mm_gm20b.h" | 40 | #include "gm20b/mm_gm20b.h" |
42 | #include "gm20b/acr_gm20b.h" | 41 | #include "gm20b/acr_gm20b.h" |
43 | #include "gp106/acr_gp106.h" | 42 | #include "gp106/acr_gp106.h" |
@@ -287,7 +286,7 @@ int gv11b_init_pmu_setup_hw1(struct gk20a *g, | |||
287 | 286 | ||
288 | /*disable irqs for hs falcon booting as we will poll for halt*/ | 287 | /*disable irqs for hs falcon booting as we will poll for halt*/ |
289 | nvgpu_mutex_acquire(&pmu->isr_mutex); | 288 | nvgpu_mutex_acquire(&pmu->isr_mutex); |
290 | pmu_enable_irq(pmu, false); | 289 | g->ops.pmu.pmu_enable_irq(pmu, false); |
291 | pmu->isr_enabled = false; | 290 | pmu->isr_enabled = false; |
292 | nvgpu_mutex_release(&pmu->isr_mutex); | 291 | nvgpu_mutex_release(&pmu->isr_mutex); |
293 | /*Clearing mailbox register used to reflect capabilities*/ | 292 | /*Clearing mailbox register used to reflect capabilities*/ |
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index cf669aa7..a728d989 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -680,6 +680,15 @@ static const struct gpu_ops gv11b_ops = { | |||
680 | .pmu_mutex_size = pwr_pmu_mutex__size_1_v, | 680 | .pmu_mutex_size = pwr_pmu_mutex__size_1_v, |
681 | .pmu_mutex_acquire = gk20a_pmu_mutex_acquire, | 681 | .pmu_mutex_acquire = gk20a_pmu_mutex_acquire, |
682 | .pmu_mutex_release = gk20a_pmu_mutex_release, | 682 | .pmu_mutex_release = gk20a_pmu_mutex_release, |
683 | .pmu_is_interrupted = gk20a_pmu_is_interrupted, | ||
684 | .pmu_isr = gk20a_pmu_isr, | ||
685 | .pmu_init_perfmon_counter = gk20a_pmu_init_perfmon_counter, | ||
686 | .pmu_pg_idle_counter_config = gk20a_pmu_pg_idle_counter_config, | ||
687 | .pmu_read_idle_counter = gk20a_pmu_read_idle_counter, | ||
688 | .pmu_reset_idle_counter = gk20a_pmu_reset_idle_counter, | ||
689 | .pmu_dump_elpg_stats = gk20a_pmu_dump_elpg_stats, | ||
690 | .pmu_dump_falcon_stats = gk20a_pmu_dump_falcon_stats, | ||
691 | .pmu_enable_irq = gk20a_pmu_enable_irq, | ||
683 | .write_dmatrfbase = gp10b_write_dmatrfbase, | 692 | .write_dmatrfbase = gp10b_write_dmatrfbase, |
684 | .pmu_elpg_statistics = gp106_pmu_elpg_statistics, | 693 | .pmu_elpg_statistics = gp106_pmu_elpg_statistics, |
685 | .pmu_init_perfmon = nvgpu_pmu_init_perfmon_rpc, | 694 | .pmu_init_perfmon = nvgpu_pmu_init_perfmon_rpc, |