diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 7 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/ltc_gp10b.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index d82a03eb..87ba5bf6 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -187,11 +187,12 @@ int gp10b_init_hal(struct gk20a *g) | |||
187 | { | 187 | { |
188 | struct gpu_ops *gops = &g->ops; | 188 | struct gpu_ops *gops = &g->ops; |
189 | struct nvgpu_gpu_characteristics *c = &g->gpu_characteristics; | 189 | struct nvgpu_gpu_characteristics *c = &g->gpu_characteristics; |
190 | struct gk20a_platform *platform = dev_get_drvdata(g->dev); | ||
190 | 191 | ||
191 | *gops = gp10b_ops; | 192 | *gops = gp10b_ops; |
192 | 193 | ||
193 | #ifdef CONFIG_TEGRA_ACR | 194 | #ifdef CONFIG_TEGRA_ACR |
194 | if (tegra_platform_is_linsim()) { | 195 | if (platform->is_fmodel) { |
195 | gops->privsecurity = 0; | 196 | gops->privsecurity = 0; |
196 | gops->securegpccs = 0; | 197 | gops->securegpccs = 0; |
197 | } else { | 198 | } else { |
@@ -206,8 +207,8 @@ int gp10b_init_hal(struct gk20a *g) | |||
206 | } | 207 | } |
207 | } | 208 | } |
208 | #else | 209 | #else |
209 | if (tegra_platform_is_linsim()) { | 210 | if (platform->is_fmodel) { |
210 | gk20a_dbg_info("running ASIM with PRIV security disabled"); | 211 | gk20a_dbg_info("running simulator with PRIV security disabled"); |
211 | gops->privsecurity = 0; | 212 | gops->privsecurity = 0; |
212 | gops->securegpccs = 0; | 213 | gops->securegpccs = 0; |
213 | } else { | 214 | } else { |
diff --git a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c index 0ccabaf8..3e64d435 100644 --- a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GP10B L2 | 2 | * GP10B L2 |
3 | * | 3 | * |
4 | * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * 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 |
7 | * under the terms and conditions of the GNU General Public License, | 7 | * under the terms and conditions of the GNU General Public License, |
@@ -70,6 +70,7 @@ static int gp10b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr) | |||
70 | u32 compbit_backing_size; | 70 | u32 compbit_backing_size; |
71 | 71 | ||
72 | int err; | 72 | int err; |
73 | struct gk20a_platform *platform = dev_get_drvdata(g->dev); | ||
73 | 74 | ||
74 | gk20a_dbg_fn(""); | 75 | gk20a_dbg_fn(""); |
75 | 76 | ||
@@ -100,7 +101,7 @@ static int gp10b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr) | |||
100 | gk20a_dbg_info("gobs_per_comptagline_per_slice: %d", | 101 | gk20a_dbg_info("gobs_per_comptagline_per_slice: %d", |
101 | gobs_per_comptagline_per_slice); | 102 | gobs_per_comptagline_per_slice); |
102 | 103 | ||
103 | if (tegra_platform_is_linsim()) | 104 | if (platform->is_fmodel) |
104 | err = gk20a_ltc_alloc_phys_cbc(g, compbit_backing_size); | 105 | err = gk20a_ltc_alloc_phys_cbc(g, compbit_backing_size); |
105 | else | 106 | else |
106 | err = gk20a_ltc_alloc_virt_cbc(g, compbit_backing_size); | 107 | err = gk20a_ltc_alloc_virt_cbc(g, compbit_backing_size); |
diff --git a/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c index 1e4796d4..210d9865 100644 --- a/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c +++ b/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c | |||
@@ -64,7 +64,7 @@ static int gp10b_tegra_get_clocks(struct device *dev) | |||
64 | struct gk20a_platform *platform = dev_get_drvdata(dev); | 64 | struct gk20a_platform *platform = dev_get_drvdata(dev); |
65 | int i; | 65 | int i; |
66 | 66 | ||
67 | if (tegra_platform_is_linsim()) | 67 | if (platform->is_fmodel) |
68 | return 0; | 68 | return 0; |
69 | 69 | ||
70 | platform->num_clks = 0; | 70 | platform->num_clks = 0; |