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

gpu: nvgpu: use single lock for gpu power on-off

Browse Source 
Using two separate locks (poweron_lock and poweroff_lock)
allows concurrent gpu power-on and power-off. This shall
not happen as driver won't be able to maintain correct
gpu state.

Use a single power_lock to manage gpu power state. This
lock will be used to manage gpu power state from multiple
triggers like gpu idle, gpu gc-off, etc.

JIRA NVGPU-1100

Change-Id: Ia9b4aeda024a5844ae9f182d453cd6341876680a
Signed-off-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1827812
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
Reviewed-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Nitin Kumbhar
2018-09-17 15:18:28 +05:30
committed by mobile promotions
parent 1982d050cc
commit fbc5296e7d
4 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,18 +129,13 @@ int gk20a_busy(struct gk20a *g)
goto fail;
}
} else {
nvgpu_mutex_acquire(&g->poweron_lock);
if (!g->power_on) {
ret = gk20a_gpu_is_virtual(dev) ?
vgpu_pm_finalize_poweron(dev)
: gk20a_pm_finalize_poweron(dev);
if (ret) {
atomic_dec(&g->usage_count.atomic_var);
nvgpu_mutex_release(&g->poweron_lock);
goto fail;
}
ret = gk20a_gpu_is_virtual(dev) ?
vgpu_pm_finalize_poweron(dev) :
gk20a_pm_finalize_poweron(dev);
if (ret) {
atomic_dec(&g->usage_count.atomic_var);
goto fail;
}
nvgpu_mutex_release(&g->poweron_lock);
}
fail:
@@ -240,12 +235,14 @@ int gk20a_pm_finalize_poweron(struct device *dev)
struct gk20a *g = get_gk20a(dev);
struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
struct gk20a_platform *platform = gk20a_get_platform(dev);
int err;
int err = 0;
nvgpu_log_fn(g, " ");
nvgpu_mutex_acquire(&g->power_lock);
if (g->power_on)
return 0;
goto done;
trace_gk20a_finalize_poweron(dev_name(dev));
@@ -254,13 +251,13 @@ int gk20a_pm_finalize_poweron(struct device *dev)
err = platform->busy(dev);
if (err < 0) {
nvgpu_err(g, "failed to poweron platform dependency");
return err;
goto done;
}
}
err = gk20a_restore_registers(g);
if (err)
return err;
goto done;
/* Enable interrupt workqueue */
if (!l->nonstall_work_queue) {
@@ -271,7 +268,7 @@ int gk20a_pm_finalize_poweron(struct device *dev)
err = gk20a_detect_chip(g);
if (err)
return err;
goto done;
if (g->sim) {
if (g->sim->sim_init_late)
@@ -319,7 +316,7 @@ int gk20a_pm_finalize_poweron(struct device *dev)
err = gk20a_sched_ctrl_init(g);
if (err) {
nvgpu_err(g, "failed to init sched control");
return err;
goto done;
}
g->sw_ready = true;
@@ -328,6 +325,7 @@ done:
if (err)
g->power_on = false;
nvgpu_mutex_release(&g->power_lock);
return err;
}
@@ -356,13 +354,13 @@ static int gk20a_pm_prepare_poweroff(struct device *dev)
#ifdef CONFIG_NVGPU_SUPPORT_CDE
struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
#endif
int ret = 0;
struct gk20a_platform *platform = gk20a_get_platform(dev);
bool irqs_enabled;
int ret = 0;
nvgpu_log_fn(g, " ");
nvgpu_mutex_acquire(&g->poweroff_lock);
nvgpu_mutex_acquire(&g->power_lock);
if (!g->power_on)
goto done;
@@ -393,7 +391,7 @@ static int gk20a_pm_prepare_poweroff(struct device *dev)
/* Stop CPU from accessing the GPU registers. */
gk20a_lockout_registers(g);
nvgpu_mutex_release(&g->poweroff_lock);
nvgpu_mutex_release(&g->power_lock);
return 0;
error:
@@ -407,7 +405,7 @@ error:
gk20a_scale_resume(dev);
done:
nvgpu_mutex_release(&g->poweroff_lock);
nvgpu_mutex_release(&g->power_lock);
return ret;
}