diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/module.c | 7 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/pci.c | 5 |
2 files changed, 1 insertions, 11 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 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c index f90b3a6e..0bad2b67 100644 --- a/drivers/gpu/nvgpu/common/linux/pci.c +++ b/drivers/gpu/nvgpu/common/linux/pci.c | |||
@@ -402,11 +402,6 @@ static int nvgpu_pci_probe(struct pci_dev *pdev, | |||
402 | } | 402 | } |
403 | disable_irq(g->irq_stall); | 403 | disable_irq(g->irq_stall); |
404 | 404 | ||
405 | /* | ||
406 | * is_fmodel needs to be in gk20a struct for deferred teardown | ||
407 | */ | ||
408 | g->is_fmodel = platform->is_fmodel; | ||
409 | |||
410 | err = nvgpu_pci_init_support(pdev); | 405 | err = nvgpu_pci_init_support(pdev); |
411 | if (err) | 406 | if (err) |
412 | return err; | 407 | return err; |