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/common/linux/module.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/common/linux/module.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/module.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c index 2cbf996b..8747c632 100644 --- a/drivers/gpu/nvgpu/common/linux/module.c +++ b/drivers/gpu/nvgpu/common/linux/module.c | |||
@@ -212,11 +212,6 @@ static int gk20a_pm_prepare_poweroff(struct device *dev) | |||
212 | if (g->irq_stall != g->irq_nonstall) | 212 | if (g->irq_stall != g->irq_nonstall) |
213 | disable_irq(g->irq_nonstall); | 213 | disable_irq(g->irq_nonstall); |
214 | 214 | ||
215 | /* | ||
216 | * is_fmodel needs to be in gk20a struct for deferred teardown | ||
217 | */ | ||
218 | g->is_fmodel = platform->is_fmodel; | ||
219 | |||
220 | /* Decrement platform power refcount */ | 215 | /* Decrement platform power refcount */ |
221 | if (platform->idle) | 216 | if (platform->idle) |
222 | platform->idle(dev); | 217 | platform->idle(dev); |
@@ -885,7 +880,7 @@ static int gk20a_probe(struct platform_device *dev) | |||
885 | gk20a->dev = &dev->dev; | 880 | gk20a->dev = &dev->dev; |
886 | 881 | ||
887 | if (nvgpu_platform_is_simulation(gk20a)) | 882 | if (nvgpu_platform_is_simulation(gk20a)) |
888 | platform->is_fmodel = true; | 883 | gk20a->is_fmodel = true; |
889 | 884 | ||
890 | nvgpu_kmem_init(gk20a); | 885 | nvgpu_kmem_init(gk20a); |
891 | 886 | ||