2 files changed, 4 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c
index c2bd9d78..b12917d6 100644
--- a/drivers/gpu/nvgpu/common/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/common/linux/driver_common.c
@@ -50,6 +50,7 @@ static void nvgpu_init_vars(struct gk20a *g)
         nvgpu_mutex_init(&platform->railgate_lock);
         nvgpu_mutex_init(&g->dbg_sessions_lock);
         nvgpu_mutex_init(&g->client_lock);
+        nvgpu_mutex_init(&g->poweron_lock);
         nvgpu_mutex_init(&g->poweroff_lock);
 
         g->regs_saved = g->regs;
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c
index b107a721..0b5dfec8 100644
--- a/drivers/gpu/nvgpu/common/linux/module.c
+++ b/drivers/gpu/nvgpu/common/linux/module.c
@@ -88,15 +88,18 @@ 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);
+                                nvgpu_mutex_release(&g->poweron_lock);
                                 goto fail;
                         }
                 }
+                nvgpu_mutex_release(&g->poweron_lock);
         }
 
 fail: