nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 02:22:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: conditional compilation of vpr code

Browse Source 
There were few more vpr related references unprotected by the config
flag. Fix those.

Bug 2834141

Change-Id: Ic934b7aeb303193c21b73921982a5df9c021ea9b
Signed-off-by: Sagar Kamble <skamble@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2306438
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Vaibhav Kachore <vkachore@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Sagar Kamble
2020-03-03 15:20:50 +05:30
committed by Alex Waterman
parent 7b301c5ace
commit fa9db74ba6
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/nvgpu/os/linux/module.c
View File

@@ -854,6 +854,7 @@ fail_timeout:
return -EBUSY;
}
#ifdef CONFIG_NVGPU_VPR
/**
* gk20a_do_idle() - wrap up for gk20a_do_idle_impl() to be called
* from outside of GPU driver
@@ -866,6 +867,7 @@ static int gk20a_do_idle(void *_g)
return gk20a_do_idle_impl(g, true);
}
#endif
/**
* gk20a_do_unidle_impl() - unblock all the tasks blocked by
@@ -905,6 +907,7 @@ int gk20a_do_unidle_impl(struct gk20a *g)
return 0;
}
#ifdef CONFIG_NVGPU_VPR
/**
* gk20a_do_unidle() - wrap up for gk20a_do_unidle_impl()
*/
@@ -915,6 +918,7 @@ static int gk20a_do_unidle(void *_g)
return gk20a_do_unidle_impl(g);
}
#endif
#endif
void __iomem *nvgpu_devm_ioremap_resource(struct platform_device *dev, int i,
struct resource **out)
@@ -970,7 +974,9 @@ void gk20a_remove_support(struct gk20a *g)
struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
struct sim_nvgpu_linux *sim_linux;
#ifdef CONFIG_NVGPU_VPR
tegra_unregister_idle_unidle(gk20a_do_idle);
#endif
#ifdef CONFIG_NVGPU_DEBUGGER
nvgpu_kfree(g, g->dbg_regops_tmp_buf);
@@ -1023,7 +1029,9 @@ static int gk20a_init_support(struct platform_device *pdev)
struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
int err = -ENOMEM;
#ifdef CONFIG_NVGPU_VPR
tegra_register_idle_unidle(gk20a_do_idle, gk20a_do_unidle, g);
#endif
l->regs = nvgpu_devm_ioremap_resource(pdev,
GK20A_BAR0_IORESOURCE_MEM,