From 50d1b0c72bfa5bf662c04db85e39c04ca3abfd67 Mon Sep 17 00:00:00 2001 From: Antony Clince Alex Date: Wed, 25 Apr 2018 21:26:21 +0530 Subject: gpu: nvgpu: os-agnostic segregation of sim/sim_pci segregated os-agnostic function from linux/sim.c and linux/sim_pci.c to sim.c and sim_pci.c, while retaining os-specific functions. renamed all gk20a_* api's to nvgpu_*. renamed hw_sim_gk20a.h to nvgpu/hw_sim.h moved hw_sim_pci.h to nvgpu/hw_sim_pci.h JIRA VQRM-2368 Change-Id: I040a6b12b19111a0b99280245808ea2b0f344cdd Signed-off-by: Antony Clince Alex Reviewed-on: https://git-master.nvidia.com/r/1702425 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/pci.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/common/linux/pci.c') diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c index 3c7de4ff..a9bcca70 100644 --- a/drivers/gpu/nvgpu/common/linux/pci.c +++ b/drivers/gpu/nvgpu/common/linux/pci.c @@ -498,15 +498,29 @@ static int nvgpu_pci_init_support(struct pci_dev *pdev) goto fail; } - err = nvgpu_pci_init_sim_support(g); + err = nvgpu_init_sim_support_linux_pci(g); if (err) goto fail; + err = nvgpu_init_sim_support_pci(g); + if (err) + goto fail_sim; nvgpu_pci_init_usermode_support(l); return 0; + fail_sim: + nvgpu_remove_sim_support_linux_pci(g); fail: + if (l->regs) { + iounmap(l->regs); + l->regs = NULL; + } + if (l->bar1) { + iounmap(l->bar1); + l->bar1 = NULL; + } + return err; } -- cgit v1.2.2