diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gp106')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/pmu_gp106.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/therm_gp106.c | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/gp106/pmu_gp106.c b/drivers/gpu/nvgpu/gp106/pmu_gp106.c index cadbd308..308bcf04 100644 --- a/drivers/gpu/nvgpu/gp106/pmu_gp106.c +++ b/drivers/gpu/nvgpu/gp106/pmu_gp106.c | |||
@@ -71,7 +71,7 @@ static int gp106_pmu_enable_hw(struct pmu_gk20a *pmu, bool enable) | |||
71 | return 0; | 71 | return 0; |
72 | } | 72 | } |
73 | udelay(PMU_MEM_SCRUBBING_TIMEOUT_DEFAULT); | 73 | udelay(PMU_MEM_SCRUBBING_TIMEOUT_DEFAULT); |
74 | } while (--retries || !tegra_platform_is_silicon()); | 74 | } while (--retries); |
75 | 75 | ||
76 | /* If scrubbing timeout, keep PMU in reset state */ | 76 | /* If scrubbing timeout, keep PMU in reset state */ |
77 | gk20a_writel(g, pwr_falcon_engine_r(), | 77 | gk20a_writel(g, pwr_falcon_engine_r(), |
diff --git a/drivers/gpu/nvgpu/gp106/therm_gp106.c b/drivers/gpu/nvgpu/gp106/therm_gp106.c index bf8fbfe7..761d1b89 100644 --- a/drivers/gpu/nvgpu/gp106/therm_gp106.c +++ b/drivers/gpu/nvgpu/gp106/therm_gp106.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -87,12 +87,6 @@ static int gp106_elcg_init_idle_filters(struct gk20a *g) | |||
87 | active_engine_id = f->active_engines_list[engine_id]; | 87 | active_engine_id = f->active_engines_list[engine_id]; |
88 | gate_ctrl = gk20a_readl(g, therm_gate_ctrl_r(active_engine_id)); | 88 | gate_ctrl = gk20a_readl(g, therm_gate_ctrl_r(active_engine_id)); |
89 | 89 | ||
90 | if (tegra_platform_is_linsim()) { | ||
91 | gate_ctrl = set_field(gate_ctrl, | ||
92 | therm_gate_ctrl_eng_delay_after_m(), | ||
93 | therm_gate_ctrl_eng_delay_after_f(4)); | ||
94 | } | ||
95 | |||
96 | gate_ctrl = set_field(gate_ctrl, | 90 | gate_ctrl = set_field(gate_ctrl, |
97 | therm_gate_ctrl_eng_idle_filt_exp_m(), | 91 | therm_gate_ctrl_eng_idle_filt_exp_m(), |
98 | therm_gate_ctrl_eng_idle_filt_exp_f(2)); | 92 | therm_gate_ctrl_eng_idle_filt_exp_f(2)); |