From ecf67ebbf69a9ab6481b1517b8920f7ac5828bb5 Mon Sep 17 00:00:00 2001 From: Sunny He Date: Wed, 28 Jun 2017 17:56:44 -0700 Subject: gpu: nvgpu: Reorg falcon HAL initialization Reorganize HAL initialization to remove inheritance and construct the gpu_ops struct at compile time. This patch only covers the falcon 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: Ib1aaaa248b079bb591ccfada3382b689452de0e9 Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1514012 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Reviewed-by: Vijayakumar Subbu --- drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gm20b') diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index b16289f9..c6c7b590 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c @@ -200,7 +200,10 @@ static const struct gpu_ops gm20b_ops = { gr_gm20b_pg_gr_load_gating_prod, }, .cde = { - .get_program_numbers = gm20b_cde_get_program_numbers + .get_program_numbers = gm20b_cde_get_program_numbers, + }, + .falcon = { + .falcon_hal_sw_init = gk20a_falcon_hal_sw_init, }, .chip_init_gpu_characteristics = gk20a_init_gpu_characteristics, .get_litter_value = gm20b_get_litter_value, @@ -215,6 +218,7 @@ int gm20b_init_hal(struct gk20a *g) gops->ltc = gm20b_ops.ltc; gops->clock_gating = gm20b_ops.clock_gating; gops->cde = gm20b_ops.cde; + gops->falcon = gm20b_ops.falcon; /* Lone functions */ gops->chip_init_gpu_characteristics = @@ -259,7 +263,6 @@ int gm20b_init_hal(struct gk20a *g) gm20b_init_ce2(gops); gm20b_init_gr_ctx(gops); gm20b_init_mm(gops); - gk20a_falcon_init_hal(gops); gm20b_init_pmu_ops(gops); gm20b_init_clk_ops(gops); gm20b_init_regops(gops); -- cgit v1.2.2