From f457e808f0d1097cec02a022eb42c77a075ef881 Mon Sep 17 00:00:00 2001 From: Sunny He Date: Wed, 26 Jul 2017 18:09:07 -0700 Subject: gpu: nvgpu: gv11b: Reorg therm HAL initialization Reorganize HAL initialization to remove inheritance and construct the gpu_ops struct at compile time. This patch only covers the therm 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: Ic297792c4d47ffbe64cc0bd95a659a6b7f383743 Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1527423 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 8 ++++++-- drivers/gpu/nvgpu/gv11b/therm_gv11b.c | 25 ------------------------- drivers/gpu/nvgpu/gv11b/therm_gv11b.h | 19 ------------------- 3 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 drivers/gpu/nvgpu/gv11b/therm_gv11b.c delete mode 100644 drivers/gpu/nvgpu/gv11b/therm_gv11b.h (limited to 'drivers/gpu/nvgpu/gv11b') diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 04712409..f6121f94 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -35,6 +35,7 @@ #include "gm20b/fifo_gm20b.h" #include "gp10b/ltc_gp10b.h" +#include "gp10b/therm_gp10b.h" #include "gp10b/mc_gp10b.h" #include "gp10b/ce_gp10b.h" #include "gp10b/priv_ring_gp10b.h" @@ -50,7 +51,6 @@ #include "gr_ctx_gv11b.h" #include "mm_gv11b.h" #include "pmu_gv11b.h" -#include "therm_gv11b.h" #include "fb_gv11b.h" #include "fifo_gv11b.h" #include "gv11b_gating_reglist.h" @@ -306,6 +306,10 @@ static const struct gpu_ops gv11b_ops = { .max_entries = gk20a_gr_max_entries, }, #endif /* CONFIG_GK20A_CTXSW_TRACE */ + .therm = { + .init_therm_setup_hw = gp10b_init_therm_setup_hw, + .elcg_init_idle_filters = gp10b_elcg_init_idle_filters, + }, .mc = { .intr_enable = mc_gv11b_intr_enable, .intr_unit_config = mc_gp10b_intr_unit_config, @@ -375,6 +379,7 @@ int gv11b_init_hal(struct gk20a *g) gops->fifo = gv11b_ops.fifo; gops->gr_ctx = gv11b_ops.gr_ctx; gops->fecs_trace = gv11b_ops.fecs_trace; + gops->therm = gv11b_ops.therm; gops->mc = gv11b_ops.mc; gops->debug = gv11b_ops.debug; gops->dbg_session_ops = gv11b_ops.dbg_session_ops; @@ -400,7 +405,6 @@ int gv11b_init_hal(struct gk20a *g) gv11b_init_mm(gops); gv11b_init_pmu_ops(g); gv11b_init_regops(gops); - gv11b_init_therm_ops(gops); g->name = "gv11b"; diff --git a/drivers/gpu/nvgpu/gv11b/therm_gv11b.c b/drivers/gpu/nvgpu/gv11b/therm_gv11b.c deleted file mode 100644 index 89520ead..00000000 --- a/drivers/gpu/nvgpu/gv11b/therm_gv11b.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * GV11B Therm - * - * 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, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - */ - -#include "gk20a/gk20a.h" - -#include "gp10b/therm_gp10b.h" - -#include "therm_gv11b.h" - -void gv11b_init_therm_ops(struct gpu_ops *gops) -{ - gp10b_init_therm_ops(gops); -} diff --git a/drivers/gpu/nvgpu/gv11b/therm_gv11b.h b/drivers/gpu/nvgpu/gv11b/therm_gv11b.h deleted file mode 100644 index 2710285a..00000000 --- a/drivers/gpu/nvgpu/gv11b/therm_gv11b.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2016, 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, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - */ -#ifndef THERM_GV11B_H -#define THERM_GV11B_H - -struct gpu_ops; -void gv11b_init_therm_ops(struct gpu_ops *gops); - -#endif /* THERM_GV11B_H */ -- cgit v1.2.2