From 64076b4b214b45fe8367e467dd6796a9bcc058a4 Mon Sep 17 00:00:00 2001 From: Sunny He Date: Wed, 28 Jun 2017 15:59:14 -0700 Subject: gpu: nvgpu: Reorg misc HAL initialization Reorganize HAL initialization to remove inheritance and construct the gpu_ops struct at compile time. This patch covers the lone function pointers 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: I30d379bf52709c8382c9d7aa87f1672ca0f89c6f Signed-off-by: Sunny He Reviewed-on: https://git-master/r/1510386 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gp106/hal_gp106.c | 140 +++++++++++++++++++----------------- 1 file changed, 73 insertions(+), 67 deletions(-) (limited to 'drivers/gpu/nvgpu/gp106') diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 69516d22..f31180cd 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c @@ -59,70 +59,6 @@ #include -static const struct gpu_ops gp106_ops = { - .ltc = { - .determine_L2_size_bytes = gp10b_determine_L2_size_bytes, - .set_zbc_color_entry = gm20b_ltc_set_zbc_color_entry, - .set_zbc_depth_entry = gm20b_ltc_set_zbc_depth_entry, - .init_cbc = NULL, - .init_fs_state = gm20b_ltc_init_fs_state, - .init_comptags = gp10b_ltc_init_comptags, - .cbc_ctrl = gm20b_ltc_cbc_ctrl, - .isr = gp10b_ltc_isr, - .cbc_fix_config = NULL, - .flush = gm20b_flush_ltc, -#ifdef CONFIG_DEBUG_FS - .sync_debugfs = gp10b_ltc_sync_debugfs, -#endif - }, - .clock_gating = { - .slcg_bus_load_gating_prod = - gp106_slcg_bus_load_gating_prod, - .slcg_ce2_load_gating_prod = - gp106_slcg_ce2_load_gating_prod, - .slcg_chiplet_load_gating_prod = - gp106_slcg_chiplet_load_gating_prod, - .slcg_ctxsw_firmware_load_gating_prod = - gp106_slcg_ctxsw_firmware_load_gating_prod, - .slcg_fb_load_gating_prod = - gp106_slcg_fb_load_gating_prod, - .slcg_fifo_load_gating_prod = - gp106_slcg_fifo_load_gating_prod, - .slcg_gr_load_gating_prod = - gr_gp106_slcg_gr_load_gating_prod, - .slcg_ltc_load_gating_prod = - ltc_gp106_slcg_ltc_load_gating_prod, - .slcg_perf_load_gating_prod = - gp106_slcg_perf_load_gating_prod, - .slcg_priring_load_gating_prod = - gp106_slcg_priring_load_gating_prod, - .slcg_pmu_load_gating_prod = - gp106_slcg_pmu_load_gating_prod, - .slcg_therm_load_gating_prod = - gp106_slcg_therm_load_gating_prod, - .slcg_xbar_load_gating_prod = - gp106_slcg_xbar_load_gating_prod, - .blcg_bus_load_gating_prod = - gp106_blcg_bus_load_gating_prod, - .blcg_ce_load_gating_prod = - gp106_blcg_ce_load_gating_prod, - .blcg_fb_load_gating_prod = - gp106_blcg_fb_load_gating_prod, - .blcg_fifo_load_gating_prod = - gp106_blcg_fifo_load_gating_prod, - .blcg_gr_load_gating_prod = - gp106_blcg_gr_load_gating_prod, - .blcg_ltc_load_gating_prod = - gp106_blcg_ltc_load_gating_prod, - .blcg_pmu_load_gating_prod = - gp106_blcg_pmu_load_gating_prod, - .blcg_xbar_load_gating_prod = - gp106_blcg_xbar_load_gating_prod, - .pg_gr_load_gating_prod = - gr_gp106_pg_gr_load_gating_prod, - } -}; - static int gp106_get_litter_value(struct gk20a *g, int value) { int ret = -EINVAL; @@ -241,6 +177,73 @@ static int gp106_init_gpu_characteristics(struct gk20a *g) return 0; } +static const struct gpu_ops gp106_ops = { + .ltc = { + .determine_L2_size_bytes = gp10b_determine_L2_size_bytes, + .set_zbc_color_entry = gm20b_ltc_set_zbc_color_entry, + .set_zbc_depth_entry = gm20b_ltc_set_zbc_depth_entry, + .init_cbc = NULL, + .init_fs_state = gm20b_ltc_init_fs_state, + .init_comptags = gp10b_ltc_init_comptags, + .cbc_ctrl = gm20b_ltc_cbc_ctrl, + .isr = gp10b_ltc_isr, + .cbc_fix_config = NULL, + .flush = gm20b_flush_ltc, +#ifdef CONFIG_DEBUG_FS + .sync_debugfs = gp10b_ltc_sync_debugfs, +#endif + }, + .clock_gating = { + .slcg_bus_load_gating_prod = + gp106_slcg_bus_load_gating_prod, + .slcg_ce2_load_gating_prod = + gp106_slcg_ce2_load_gating_prod, + .slcg_chiplet_load_gating_prod = + gp106_slcg_chiplet_load_gating_prod, + .slcg_ctxsw_firmware_load_gating_prod = + gp106_slcg_ctxsw_firmware_load_gating_prod, + .slcg_fb_load_gating_prod = + gp106_slcg_fb_load_gating_prod, + .slcg_fifo_load_gating_prod = + gp106_slcg_fifo_load_gating_prod, + .slcg_gr_load_gating_prod = + gr_gp106_slcg_gr_load_gating_prod, + .slcg_ltc_load_gating_prod = + ltc_gp106_slcg_ltc_load_gating_prod, + .slcg_perf_load_gating_prod = + gp106_slcg_perf_load_gating_prod, + .slcg_priring_load_gating_prod = + gp106_slcg_priring_load_gating_prod, + .slcg_pmu_load_gating_prod = + gp106_slcg_pmu_load_gating_prod, + .slcg_therm_load_gating_prod = + gp106_slcg_therm_load_gating_prod, + .slcg_xbar_load_gating_prod = + gp106_slcg_xbar_load_gating_prod, + .blcg_bus_load_gating_prod = + gp106_blcg_bus_load_gating_prod, + .blcg_ce_load_gating_prod = + gp106_blcg_ce_load_gating_prod, + .blcg_fb_load_gating_prod = + gp106_blcg_fb_load_gating_prod, + .blcg_fifo_load_gating_prod = + gp106_blcg_fifo_load_gating_prod, + .blcg_gr_load_gating_prod = + gp106_blcg_gr_load_gating_prod, + .blcg_ltc_load_gating_prod = + gp106_blcg_ltc_load_gating_prod, + .blcg_pmu_load_gating_prod = + gp106_blcg_pmu_load_gating_prod, + .blcg_xbar_load_gating_prod = + gp106_blcg_xbar_load_gating_prod, + .pg_gr_load_gating_prod = + gr_gp106_pg_gr_load_gating_prod, + }, + .get_litter_value = gp106_get_litter_value, + .chip_init_gpu_characteristics = gp106_init_gpu_characteristics, + .bios_init = gm206_bios_init, +}; + int gp106_init_hal(struct gk20a *g) { struct gpu_ops *gops = &g->ops; @@ -251,6 +254,12 @@ int gp106_init_hal(struct gk20a *g) gops->ltc = gp106_ops.ltc; gops->clock_gating = gp106_ops.clock_gating; + /* Lone functions */ + gops->get_litter_value = gp106_ops.get_litter_value; + gops->chip_init_gpu_characteristics = + gp106_ops.chip_init_gpu_characteristics; + gops->bios_init = gp106_ops.bios_init; + gops->privsecurity = 1; gops->securegpccs = 1; gops->pmupstate = true; @@ -277,13 +286,10 @@ int gp106_init_hal(struct gk20a *g) #if defined(CONFIG_GK20A_CYCLE_STATS) gk20a_init_css_ops(gops); #endif - gm206_init_bios_ops(gops); gp106_init_therm_ops(gops); gp106_init_xve_ops(gops); g->name = "gp10x"; - gops->get_litter_value = gp106_get_litter_value; - gops->chip_init_gpu_characteristics = gp106_init_gpu_characteristics; gops->gr_ctx.use_dma_for_fw_bootstrap = true; c->twod_class = FERMI_TWOD_A; -- cgit v1.2.2