gpu: nvgpu: Reorg gr HAL initialization

Reorganize HAL initialization to remove inheritance and construct
the gpu_ops struct at compile time. This patch only covers the
gr sub-module of the gpu_ops struct.

Perform HAL function assignments in hal_gxxxx.c through the
population of a chip-specific copy of gpu_ops.

Jira NVGPU-74

Change-Id: I8feaa95a9830969221f7ac70a5ef61cdf25094c3
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1542988
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 147 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c
index e3c2d1cb..4f21e433 100644
--- a/drivers/gpu/nvgpu/gv100/hal_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c
@@ -33,6 +33,7 @@
 #include "gk20a/fb_gk20a.h"
 #include "gk20a/mm_gk20a.h"
 #include "gk20a/pmu_gk20a.h"
+#include "gk20a/gr_gk20a.h"
 
 #include "gm20b/ltc_gm20b.h"
 #include "gm20b/gr_gm20b.h"
@@ -43,6 +44,7 @@
 #include "gm20b/acr_gm20b.h"
 
 #include "gp10b/fb_gp10b.h"
+#include "gp10b/gr_gp10b.h"
 
 #include "gp106/clk_gp106.h"
 #include "gp106/clk_arb_gp106.h"
@@ -215,6 +217,150 @@ static const struct gpu_ops gv100_ops = {
                 .isr_nonstall = gp10b_ce_nonstall_isr,
                 .get_num_pce = gv11b_ce_get_num_pce,
         },
+        .gr = {
+                .init_gpc_mmu = gr_gv11b_init_gpc_mmu,
+                .bundle_cb_defaults = gr_gv11b_bundle_cb_defaults,
+                .cb_size_default = gr_gv11b_cb_size_default,
+                .calc_global_ctx_buffer_size =
+                        gr_gv11b_calc_global_ctx_buffer_size,
+                .commit_global_attrib_cb = gr_gv11b_commit_global_attrib_cb,
+                .commit_global_bundle_cb = gr_gp10b_commit_global_bundle_cb,
+                .commit_global_cb_manager = gr_gp10b_commit_global_cb_manager,
+                .commit_global_pagepool = gr_gp10b_commit_global_pagepool,
+                .handle_sw_method = gr_gv11b_handle_sw_method,
+                .set_alpha_circular_buffer_size =
+                        gr_gv11b_set_alpha_circular_buffer_size,
+                .set_circular_buffer_size = gr_gv11b_set_circular_buffer_size,
+                .enable_hww_exceptions = gr_gv11b_enable_hww_exceptions,
+                .is_valid_class = gr_gv11b_is_valid_class,
+                .is_valid_gfx_class = gr_gv11b_is_valid_gfx_class,
+                .is_valid_compute_class = gr_gv11b_is_valid_compute_class,
+                .get_sm_dsm_perf_regs = gv11b_gr_get_sm_dsm_perf_regs,
+                .get_sm_dsm_perf_ctrl_regs = gv11b_gr_get_sm_dsm_perf_ctrl_regs,
+                .init_fs_state = gr_gv11b_init_fs_state,
+                .set_hww_esr_report_mask = gv11b_gr_set_hww_esr_report_mask,
+                .falcon_load_ucode = gr_gm20b_load_ctxsw_ucode_segments,
+                .load_ctxsw_ucode = gr_gm20b_load_ctxsw_ucode,
+                .set_gpc_tpc_mask = gr_gv11b_set_gpc_tpc_mask,
+                .get_gpc_tpc_mask = gr_gm20b_get_gpc_tpc_mask,
+                .free_channel_ctx = gk20a_free_channel_ctx,
+                .alloc_obj_ctx = gk20a_alloc_obj_ctx,
+                .bind_ctxsw_zcull = gr_gk20a_bind_ctxsw_zcull,
+                .get_zcull_info = gr_gk20a_get_zcull_info,
+                .is_tpc_addr = gr_gm20b_is_tpc_addr,
+                .get_tpc_num = gr_gm20b_get_tpc_num,
+                .detect_sm_arch = gr_gv11b_detect_sm_arch,
+                .add_zbc_color = gr_gp10b_add_zbc_color,
+                .add_zbc_depth = gr_gp10b_add_zbc_depth,
+                .zbc_set_table = gk20a_gr_zbc_set_table,
+                .zbc_query_table = gr_gk20a_query_zbc,
+                .pmu_save_zbc = gk20a_pmu_save_zbc,
+                .add_zbc = gr_gk20a_add_zbc,
+                .pagepool_default_size = gr_gv11b_pagepool_default_size,
+                .init_ctx_state = gr_gp10b_init_ctx_state,
+                .alloc_gr_ctx = gr_gp10b_alloc_gr_ctx,
+                .free_gr_ctx = gr_gp10b_free_gr_ctx,
+                .update_ctxsw_preemption_mode =
+                        gr_gp10b_update_ctxsw_preemption_mode,
+                .dump_gr_regs = gr_gv11b_dump_gr_status_regs,
+                .update_pc_sampling = gr_gm20b_update_pc_sampling,
+                .get_fbp_en_mask = gr_gm20b_get_fbp_en_mask,
+                .get_max_ltc_per_fbp = gr_gm20b_get_max_ltc_per_fbp,
+                .get_max_lts_per_ltc = gr_gm20b_get_max_lts_per_ltc,
+                .get_rop_l2_en_mask = gr_gm20b_rop_l2_en_mask,
+                .get_max_fbps_count = gr_gm20b_get_max_fbps_count,
+                .init_sm_dsm_reg_info = gv11b_gr_init_sm_dsm_reg_info,
+                .wait_empty = gr_gv11b_wait_empty,
+                .init_cyclestats = gr_gv11b_init_cyclestats,
+                .set_sm_debug_mode = gv11b_gr_set_sm_debug_mode,
+                .enable_cde_in_fecs = gr_gm20b_enable_cde_in_fecs,
+                .bpt_reg_info = gv11b_gr_bpt_reg_info,
+                .get_access_map = gr_gv11b_get_access_map,
+                .handle_fecs_error = gr_gv11b_handle_fecs_error,
+                .handle_sm_exception = gr_gk20a_handle_sm_exception,
+                .handle_tex_exception = gr_gv11b_handle_tex_exception,
+                .enable_gpc_exceptions = gr_gv11b_enable_gpc_exceptions,
+                .enable_exceptions = gr_gv11b_enable_exceptions,
+                .get_lrf_tex_ltc_dram_override = get_ecc_override_val,
+                .update_smpc_ctxsw_mode = gr_gk20a_update_smpc_ctxsw_mode,
+                .update_hwpm_ctxsw_mode = gr_gk20a_update_hwpm_ctxsw_mode,
+                .record_sm_error_state = gv11b_gr_record_sm_error_state,
+                .update_sm_error_state = gv11b_gr_update_sm_error_state,
+                .clear_sm_error_state = gm20b_gr_clear_sm_error_state,
+                .suspend_contexts = gr_gp10b_suspend_contexts,
+                .resume_contexts = gr_gk20a_resume_contexts,
+                .get_preemption_mode_flags = gr_gp10b_get_preemption_mode_flags,
+                .fuse_override = gp10b_gr_fuse_override,
+                .init_sm_id_table = gr_gv11b_init_sm_id_table,
+                .load_smid_config = gr_gv11b_load_smid_config,
+                .program_sm_id_numbering = gr_gv11b_program_sm_id_numbering,
+                .is_ltcs_ltss_addr = gr_gm20b_is_ltcs_ltss_addr,
+                .is_ltcn_ltss_addr = gr_gm20b_is_ltcn_ltss_addr,
+                .split_lts_broadcast_addr = gr_gm20b_split_lts_broadcast_addr,
+                .split_ltc_broadcast_addr = gr_gm20b_split_ltc_broadcast_addr,
+                .setup_rop_mapping = gr_gv11b_setup_rop_mapping,
+                .program_zcull_mapping = gr_gv11b_program_zcull_mapping,
+                .commit_global_timeslice = gr_gv11b_commit_global_timeslice,
+                .commit_inst = gr_gv11b_commit_inst,
+                .write_zcull_ptr = gr_gv11b_write_zcull_ptr,
+                .write_pm_ptr = gr_gv11b_write_pm_ptr,
+                .init_elcg_mode = gr_gv11b_init_elcg_mode,
+                .load_tpc_mask = gr_gv11b_load_tpc_mask,
+                .inval_icache = gr_gk20a_inval_icache,
+                .trigger_suspend = gv11b_gr_sm_trigger_suspend,
+                .wait_for_pause = gr_gk20a_wait_for_pause,
+                .resume_from_pause = gv11b_gr_resume_from_pause,
+                .clear_sm_errors = gr_gk20a_clear_sm_errors,
+                .tpc_enabled_exceptions = gr_gk20a_tpc_enabled_exceptions,
+                .get_esr_sm_sel = gv11b_gr_get_esr_sm_sel,
+                .sm_debugger_attached = gv11b_gr_sm_debugger_attached,
+                .suspend_single_sm = gv11b_gr_suspend_single_sm,
+                .suspend_all_sms = gv11b_gr_suspend_all_sms,
+                .resume_single_sm = gv11b_gr_resume_single_sm,
+                .resume_all_sms = gv11b_gr_resume_all_sms,
+                .get_sm_hww_warp_esr = gv11b_gr_get_sm_hww_warp_esr,
+                .get_sm_hww_global_esr = gv11b_gr_get_sm_hww_global_esr,
+                .get_sm_no_lock_down_hww_global_esr_mask =
+                        gv11b_gr_get_sm_no_lock_down_hww_global_esr_mask,
+                .lock_down_sm = gv11b_gr_lock_down_sm,
+                .wait_for_sm_lock_down = gv11b_gr_wait_for_sm_lock_down,
+                .clear_sm_hww = gv11b_gr_clear_sm_hww,
+                .init_ovr_sm_dsm_perf =  gv11b_gr_init_ovr_sm_dsm_perf,
+                .get_ovr_perf_regs = gv11b_gr_get_ovr_perf_regs,
+                .disable_rd_coalesce = gm20a_gr_disable_rd_coalesce,
+                .set_boosted_ctx = gr_gp10b_set_boosted_ctx,
+                .set_preemption_mode = gr_gp10b_set_preemption_mode,
+                .set_czf_bypass = NULL,
+                .pre_process_sm_exception = gr_gv11b_pre_process_sm_exception,
+                .set_preemption_buffer_va = gr_gv11b_set_preemption_buffer_va,
+                .init_preemption_state = NULL,
+                .update_boosted_ctx = gr_gp10b_update_boosted_ctx,
+                .set_bes_crop_debug3 = gr_gp10b_set_bes_crop_debug3,
+                .create_gr_sysfs = gr_gv11b_create_sysfs,
+                .set_ctxsw_preemption_mode = gr_gp10b_set_ctxsw_preemption_mode,
+                .is_etpc_addr = gv11b_gr_pri_is_etpc_addr,
+                .egpc_etpc_priv_addr_table = gv11b_gr_egpc_etpc_priv_addr_table,
+                .handle_tpc_mpc_exception = gr_gv11b_handle_tpc_mpc_exception,
+                .zbc_s_query_table = gr_gv11b_zbc_s_query_table,
+                .load_zbc_s_default_tbl = gr_gv11b_load_stencil_default_tbl,
+                .restore_context_header = gv11b_restore_context_header,
+                .handle_gpc_gpcmmu_exception =
+                        gr_gv11b_handle_gpc_gpcmmu_exception,
+                .add_zbc_type_s = gr_gv11b_add_zbc_type_s,
+                .get_egpc_base = gv11b_gr_get_egpc_base,
+                .get_egpc_etpc_num = gv11b_gr_get_egpc_etpc_num,
+                .handle_gpc_gpccs_exception =
+                        gr_gv11b_handle_gpc_gpccs_exception,
+                .load_zbc_s_tbl = gr_gv11b_load_stencil_tbl,
+                .access_smpc_reg = gv11b_gr_access_smpc_reg,
+                .is_egpc_addr = gv11b_gr_pri_is_egpc_addr,
+                .add_zbc_s = gr_gv11b_add_zbc_stencil,
+                .handle_gcc_exception = gr_gv11b_handle_gcc_exception,
+                .init_sw_veid_bundle = gr_gv11b_init_sw_veid_bundle,
+                .handle_tpc_sm_ecc_exception =
+                        gr_gv11b_handle_tpc_sm_ecc_exception,
+                .decode_egpc_addr = gv11b_gr_decode_egpc_addr,
+        },
         .fb = {
                 .reset = gv100_fb_reset,
                 .init_hw = gk20a_fb_init_hw,
@@ -483,6 +629,7 @@ int gv100_init_hal(struct gk20a *g)
 
         gops->ltc = gv100_ops.ltc;
         gops->ce2 = gv100_ops.ce2;
+        gops->gr = gv100_ops.gr;
         gops->fb = gv100_ops.fb;
         gops->clock_gating = gv100_ops.clock_gating;
         gops->fifo = gv100_ops.fifo;
@@ -525,8 +672,6 @@ int gv100_init_hal(struct gk20a *g)
         g->pmu_lsf_pmu_wpr_init_done = 0;
         g->bootstrap_owner = LSF_FALCON_ID_SEC2;
 
-        gv11b_init_gr(g);
-
         gv11b_init_uncompressed_kind_map();
         gv11b_init_kind_attr();