From 6431ec360bf7b7baf6dd687b1525c40114ede189 Mon Sep 17 00:00:00 2001 From: Sunny He Date: Wed, 26 Jul 2017 10:47:16 -0700 Subject: gpu: nvgpu: Reorg gr_ctx HAL initialization Reorganize HAL initialization to remove inheritance and construct the gpu_ops struct at compile time. This patch only covers the gr_ctx 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: I783d8e8919d8694ad2aa0d285e4c5a2b62580f48 Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1527417 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c') diff --git a/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c b/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c index 3a49cc60..706ff7e0 100644 --- a/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c +++ b/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c @@ -1,7 +1,7 @@ /* * GP106 Graphics Context * - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -16,7 +16,7 @@ #include "gk20a/gk20a.h" #include "gr_ctx_gp106.h" -static int gr_gp106_get_netlist_name(struct gk20a *g, int index, char *name) +int gr_gp106_get_netlist_name(struct gk20a *g, int index, char *name) { u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl; @@ -36,14 +36,7 @@ static int gr_gp106_get_netlist_name(struct gk20a *g, int index, char *name) return 0; } -static bool gr_gp106_is_firmware_defined(void) +bool gr_gp106_is_firmware_defined(void) { return true; } - -void gp106_init_gr_ctx(struct gpu_ops *gops) -{ - gops->gr_ctx.get_netlist_name = gr_gp106_get_netlist_name; - gops->gr_ctx.is_fw_defined = gr_gp106_is_firmware_defined; - gops->gr_ctx.use_dma_for_fw_bootstrap = false; -} -- cgit v1.2.2