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

Revert "gpu: nvgpu: correct usage for gk20a_busy_noresume"

Browse Source 
This reverts commit c1ea9e3955.

Reason for revert: ap_vulkan, ap_opengles, ap_mods tests failures
Bug 3661058
Bug 3661080 
Bug 3659004 

Change-Id: I929b5675a4fb0ddc8cbf3eeefc982b4ba04ddc59
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2718996
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
This commit is contained in:
Krishna Reddy
2022-05-26 16:24:46 -07:00
parent a80c445a5d
commit 961925be02
9 changed files with 52 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,63 +168,9 @@ struct device_node *nvgpu_get_node(struct gk20a *g)
return dev->of_node;
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
static bool gk20a_pm_runtime_get_if_in_use(struct gk20a *g)
void gk20a_busy_noresume(struct gk20a *g)
{
int ret = pm_runtime_get_if_active(dev_from_gk20a(g), true);
if (ret == 1) {
return true;
} else {
return false;
}
}
#endif
static bool gk20a_busy_noresume_legacy(struct gk20a *g)
{
struct device *dev = dev_from_gk20a(g);;
pm_runtime_get_noresume(dev);
if (nvgpu_is_powered_off(g)) {
pm_runtime_put_noidle(dev);
return false;
} else {
return true;
}
}
/*
* Cases:
* 1) For older than Kernel 5.8, use legacy
* i.e. gk20a_busy_noresume_legacy()
* 2) else if pm_runtime_disabled (e.g. VGPU, DGPU)
* use legacy.
* 3) Else use gk20a_pm_runtime_get_if_in_use()
*/
bool gk20a_busy_noresume(struct gk20a *g)
{
struct device *dev;
if (!g)
return false;
dev = dev_from_gk20a(g);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
if (pm_runtime_enabled(dev)) {
if (gk20a_pm_runtime_get_if_in_use(g)) {
atomic_inc(&g->usage_count.atomic_var);
return true;
} else {
return false;
}
} else {
/* VGPU, DGPU */
return gk20a_busy_noresume_legacy(g);
}
#else
return gk20a_busy_noresume_legacy(g);
#endif
pm_runtime_get_noresume(dev_from_gk20a(g));
}
int gk20a_busy(struct gk20a *g)
@@ -276,17 +222,7 @@ fail:
void gk20a_idle_nosuspend(struct gk20a *g)
{
struct device *dev = dev_from_gk20a(g);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
if (pm_runtime_enabled(dev)) {
gk20a_idle(g);
} else {
pm_runtime_put_noidle(dev);
}
#else
pm_runtime_put_noidle(dev);
#endif
pm_runtime_put_noidle(dev_from_gk20a(g));
}
void gk20a_idle(struct gk20a *g)
@@ -2005,14 +1941,6 @@ int nvgpu_remove(struct device *dev)
err = nvgpu_quiesce(g);
WARN(err, "gpu failed to idle during driver removal");
/**
* nvgpu_quiesce has been invoked already, disable pm runtime.
* Informs PM domain that its safe to power down the h/w now.
* Anything after this is just software deinit. Any cache/tlb
* flush/invalidate must have already happened before this.
*/
gk20a_pm_deinit(dev);
if (nvgpu_mem_is_valid(&g->syncpt_mem))
nvgpu_dma_free(g, &g->syncpt_mem);
@@ -2073,6 +2001,8 @@ static int __exit gk20a_remove(struct platform_device *pdev)
nvgpu_put(g);
gk20a_pm_deinit(dev);
return err;
}