diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/hal_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 9444002b..0d9f65bf 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -877,17 +877,10 @@ int gv11b_init_hal(struct gk20a *g) | |||
877 | if (nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) { | 877 | if (nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) { |
878 | /* Add in ops from gm20b acr */ | 878 | /* Add in ops from gm20b acr */ |
879 | gops->pmu.prepare_ucode = gp106_prepare_ucode_blob, | 879 | gops->pmu.prepare_ucode = gp106_prepare_ucode_blob, |
880 | gops->pmu.pmu_setup_hw_and_bootstrap = gv11b_bootstrap_hs_flcn, | ||
881 | gops->pmu.get_wpr = gm20b_wpr_info, | ||
882 | gops->pmu.alloc_blob_space = gv11b_alloc_blob_space, | ||
883 | gops->pmu.pmu_populate_loader_cfg = | 880 | gops->pmu.pmu_populate_loader_cfg = |
884 | gp106_pmu_populate_loader_cfg, | 881 | gp106_pmu_populate_loader_cfg, |
885 | gops->pmu.flcn_populate_bl_dmem_desc = | 882 | gops->pmu.flcn_populate_bl_dmem_desc = |
886 | gp106_flcn_populate_bl_dmem_desc, | 883 | gp106_flcn_populate_bl_dmem_desc, |
887 | gops->pmu.falcon_wait_for_halt = pmu_wait_for_halt, | ||
888 | gops->pmu.falcon_clear_halt_interrupt_status = | ||
889 | clear_halt_interrupt_status, | ||
890 | gops->pmu.init_falcon_setup_hw = gv11b_init_pmu_setup_hw1, | ||
891 | gops->pmu.update_lspmu_cmdline_args = | 884 | gops->pmu.update_lspmu_cmdline_args = |
892 | gm20b_update_lspmu_cmdline_args; | 885 | gm20b_update_lspmu_cmdline_args; |
893 | gops->pmu.setup_apertures = gv11b_setup_apertures; | 886 | gops->pmu.setup_apertures = gv11b_setup_apertures; |
@@ -901,11 +894,9 @@ int gv11b_init_hal(struct gk20a *g) | |||
901 | } else { | 894 | } else { |
902 | /* Inherit from gk20a */ | 895 | /* Inherit from gk20a */ |
903 | gops->pmu.prepare_ucode = nvgpu_pmu_prepare_ns_ucode_blob, | 896 | gops->pmu.prepare_ucode = nvgpu_pmu_prepare_ns_ucode_blob, |
904 | gops->pmu.pmu_setup_hw_and_bootstrap = gk20a_init_pmu_setup_hw1, | ||
905 | 897 | ||
906 | gops->pmu.load_lsfalcon_ucode = NULL; | 898 | gops->pmu.load_lsfalcon_ucode = NULL; |
907 | gops->pmu.init_wpr_region = NULL; | 899 | gops->pmu.init_wpr_region = NULL; |
908 | gops->pmu.pmu_setup_hw_and_bootstrap = gp10b_init_pmu_setup_hw1; | ||
909 | 900 | ||
910 | gops->gr.load_ctxsw_ucode = gr_gk20a_load_ctxsw_ucode; | 901 | gops->gr.load_ctxsw_ucode = gr_gk20a_load_ctxsw_ucode; |
911 | } | 902 | } |