diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-14 16:11:18 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-19 16:24:30 -0400 |
commit | 6df49a63ca5f9d77a6d7d6c7dbaaa0fba1b707ca (patch) | |
tree | b50c57b2759fb4a20390880ea5b5d874d324d046 /drivers/gpu/nvgpu/gk20a/therm_gk20a.c | |
parent | 15e9b433f3a33f4d68582d8eeabfcfd32db8c340 (diff) |
gpu: nvgpu: Move is_fmodel to struct gk20a
Copy is_fmodel to struct gk20a at probe time, and access it from
gk20a instead of platform_gk20a.
JIRA NVGPU-16
Change-Id: Ib8d793ea2b02b62da3bfdbb6372d9927658b7ec6
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1463540
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/therm_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/therm_gk20a.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/therm_gk20a.c b/drivers/gpu/nvgpu/gk20a/therm_gk20a.c index 234c2937..0d2f1281 100644 --- a/drivers/gpu/nvgpu/gk20a/therm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/therm_gk20a.c | |||
@@ -117,7 +117,6 @@ int gk20a_elcg_init_idle_filters(struct gk20a *g) | |||
117 | u32 engine_id; | 117 | u32 engine_id; |
118 | u32 active_engine_id = 0; | 118 | u32 active_engine_id = 0; |
119 | struct fifo_gk20a *f = &g->fifo; | 119 | struct fifo_gk20a *f = &g->fifo; |
120 | struct gk20a_platform *platform = dev_get_drvdata(g->dev); | ||
121 | 120 | ||
122 | gk20a_dbg_fn(""); | 121 | gk20a_dbg_fn(""); |
123 | 122 | ||
@@ -125,7 +124,7 @@ int gk20a_elcg_init_idle_filters(struct gk20a *g) | |||
125 | active_engine_id = f->active_engines_list[engine_id]; | 124 | active_engine_id = f->active_engines_list[engine_id]; |
126 | gate_ctrl = gk20a_readl(g, therm_gate_ctrl_r(active_engine_id)); | 125 | gate_ctrl = gk20a_readl(g, therm_gate_ctrl_r(active_engine_id)); |
127 | 126 | ||
128 | if (platform->is_fmodel) { | 127 | if (g->is_fmodel) { |
129 | gate_ctrl = set_field(gate_ctrl, | 128 | gate_ctrl = set_field(gate_ctrl, |
130 | therm_gate_ctrl_eng_delay_after_m(), | 129 | therm_gate_ctrl_eng_delay_after_m(), |
131 | therm_gate_ctrl_eng_delay_after_f(4)); | 130 | therm_gate_ctrl_eng_delay_after_f(4)); |