summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp10b/therm_gp10b.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-03-29 18:00:24 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-04-11 13:56:06 -0400
commit19fdb429c2b04d13faecad8b2e5466e9f3c7b8c7 (patch)
treee92f6d93ae2593286546f983b9a1fff8638aa9a6 /drivers/gpu/nvgpu/gp10b/therm_gp10b.c
parent1a4647272f4fe50137c79583b698c1ef6f5def12 (diff)
gpu: nvgpu: Wrappers for checking platform type
Add nvgpu_* wrappers for determining if we're running in simulation or silicon, and if we're running in hypervisor. The new wrappers require struct gk20a pointer, and gk20a_fence_wait() did not have access to one. Add struct gk20a pointer as the first parameter. JIRA NVGPU-16 Change-Id: I73b2b8f091ca29fb1827054abd2adaf583710331 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1331565 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b/therm_gp10b.c')
-rw-r--r--drivers/gpu/nvgpu/gp10b/therm_gp10b.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/therm_gp10b.c b/drivers/gpu/nvgpu/gp10b/therm_gp10b.c
index 4b346313..3656cef3 100644
--- a/drivers/gpu/nvgpu/gp10b/therm_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/therm_gp10b.c
@@ -1,9 +1,7 @@
1/* 1/*
2 * drivers/gpu/nvgpu/gm20b/therm_gk20a.c
3 *
4 * GP10B Therm 2 * GP10B Therm
5 * 3 *
6 * Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved.
7 * 5 *
8 * This program is free software; you can redistribute it and/or modify it 6 * This program is free software; you can redistribute it and/or modify it
9 * under the terms and conditions of the GNU General Public License, 7 * under the terms and conditions of the GNU General Public License,
@@ -17,6 +15,8 @@
17 15
18#include "gk20a/gk20a.h" 16#include "gk20a/gk20a.h"
19 17
18#include <nvgpu/soc.h>
19
20#include <nvgpu/hw/gp10b/hw_therm_gp10b.h> 20#include <nvgpu/hw/gp10b/hw_therm_gp10b.h>
21 21
22static int gp10b_init_therm_setup_hw(struct gk20a *g) 22static int gp10b_init_therm_setup_hw(struct gk20a *g)
@@ -92,7 +92,7 @@ static int gp10b_elcg_init_idle_filters(struct gk20a *g)
92 active_engine_id = f->active_engines_list[engine_id]; 92 active_engine_id = f->active_engines_list[engine_id];
93 gate_ctrl = gk20a_readl(g, therm_gate_ctrl_r(active_engine_id)); 93 gate_ctrl = gk20a_readl(g, therm_gate_ctrl_r(active_engine_id));
94 94
95 if (tegra_platform_is_linsim()) { 95 if (nvgpu_platform_is_simulation(g)) {
96 gate_ctrl = set_field(gate_ctrl, 96 gate_ctrl = set_field(gate_ctrl,
97 therm_gate_ctrl_eng_delay_after_m(), 97 therm_gate_ctrl_eng_delay_after_m(),
98 therm_gate_ctrl_eng_delay_after_f(4)); 98 therm_gate_ctrl_eng_delay_after_f(4));