nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: gv11b: Reorg therm HAL initialization

Browse Source 
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 <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1527423
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Sunny He
2017-07-26 18:09:07 -07:00
committed by mobile promotions
parent 8aa0370005
commit f457e808f0
4 changed files with 6 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/nvgpu/Makefile
View File

@@ -15,7 +15,6 @@ nvgpu-y += \
$(nvgpu-t19x)/gv11b/ce_gv11b.o \
$(nvgpu-t19x)/gv11b/gr_ctx_gv11b.o \
$(nvgpu-t19x)/gv11b/pmu_gv11b.o \
$(nvgpu-t19x)/gv11b/therm_gv11b.o \
$(nvgpu-t19x)/gv11b/subctx_gv11b.o \
$(nvgpu-t19x)/gv11b/regops_gv11b.o

8
drivers/gpu/nvgpu/gv11b/hal_gv11b.c
View File

@@ -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";

25
drivers/gpu/nvgpu/gv11b/therm_gv11b.c
View File

@@ -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);
}

19
drivers/gpu/nvgpu/gv11b/therm_gv11b.h
View File

@@ -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 */