From 6df49a63ca5f9d77a6d7d6c7dbaaa0fba1b707ca Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 14 Apr 2017 13:11:18 -0700 Subject: 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 Reviewed-on: http://git-master/r/1463540 Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/common/linux/module.c | 7 +------ drivers/gpu/nvgpu/common/linux/pci.c | 5 ----- 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'drivers/gpu/nvgpu/common') 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) if (g->irq_stall != g->irq_nonstall) disable_irq(g->irq_nonstall); - /* - * is_fmodel needs to be in gk20a struct for deferred teardown - */ - g->is_fmodel = platform->is_fmodel; - /* Decrement platform power refcount */ if (platform->idle) platform->idle(dev); @@ -885,7 +880,7 @@ static int gk20a_probe(struct platform_device *dev) gk20a->dev = &dev->dev; if (nvgpu_platform_is_simulation(gk20a)) - platform->is_fmodel = true; + gk20a->is_fmodel = true; nvgpu_kmem_init(gk20a); 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, } disable_irq(g->irq_stall); - /* - * is_fmodel needs to be in gk20a struct for deferred teardown - */ - g->is_fmodel = platform->is_fmodel; - err = nvgpu_pci_init_support(pdev); if (err) return err; -- cgit v1.2.2