gpu: nvgpu: pass gk20a struct to gk20a_busy

After driver remove, the device structure passed in gk20a_busy can be
invalid. To solve this the prototype of the function is modified to pass
the gk20a struct instead of the device pointer.

bug 200277762
JIRA: EVLR-1023

Change-Id: I08eb74bd3578834d45115098ed9936ebbb436fdf
Signed-off-by: David Nieto <dmartineznie@nvidia.com>
Reviewed-on: http://git-master/r/1320194
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
GVS: Gerrit_Virtual_Submit

1 files changed, 14 insertions, 14 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
index 21b50700..7725e970 100644
--- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
@@ -550,7 +550,7 @@ static int gk20a_tsg_ioctl_set_priority(struct gk20a *g,
                 goto done;
         }
 
-        err = gk20a_busy(g->dev);
+        err = gk20a_busy(g);
         if (err) {
                 gk20a_err(dev_from_gk20a(g), "failed to power on gpu");
                 goto done;
@@ -558,7 +558,7 @@ static int gk20a_tsg_ioctl_set_priority(struct gk20a *g,
 
         err = gk20a_tsg_set_priority(g, tsg, arg->priority);
 
-        gk20a_idle(g->dev);
+        gk20a_idle(g);
 done:
         nvgpu_mutex_release(&sched->control_lock);
         return err;
@@ -577,7 +577,7 @@ static int gk20a_tsg_ioctl_set_runlist_interleave(struct gk20a *g,
                 err = -EPERM;
                 goto done;
         }
-        err = gk20a_busy(g->dev);
+        err = gk20a_busy(g);
         if (err) {
                 gk20a_err(dev_from_gk20a(g), "failed to power on gpu");
                 goto done;
@@ -585,7 +585,7 @@ static int gk20a_tsg_ioctl_set_runlist_interleave(struct gk20a *g,
 
         err = gk20a_tsg_set_runlist_interleave(tsg, arg->level);
 
-        gk20a_idle(g->dev);
+        gk20a_idle(g);
 done:
         nvgpu_mutex_release(&sched->control_lock);
         return err;
@@ -604,13 +604,13 @@ static int gk20a_tsg_ioctl_set_timeslice(struct gk20a *g,
                 err = -EPERM;
                 goto done;
         }
-        err = gk20a_busy(g->dev);
+        err = gk20a_busy(g);
         if (err) {
                 gk20a_err(dev_from_gk20a(g), "failed to power on gpu");
                 goto done;
         }
         err = gk20a_tsg_set_timeslice(tsg, arg->timeslice_us);
-        gk20a_idle(g->dev);
+        gk20a_idle(g);
 done:
         nvgpu_mutex_release(&sched->control_lock);
         return err;
@@ -641,11 +641,11 @@ long gk20a_tsg_dev_ioctl(struct file *filp, unsigned int cmd,
         }
 
         if (!g->gr.sw_ready) {
-                err = gk20a_busy(g->dev);
+                err = gk20a_busy(g);
                 if (err)
                         return err;
 
-                gk20a_idle(g->dev);
+                gk20a_idle(g);
         }
 
         switch (cmd) {
@@ -668,33 +668,33 @@ long gk20a_tsg_dev_ioctl(struct file *filp, unsigned int cmd,
 
         case NVGPU_IOCTL_TSG_ENABLE:
                 {
-                err = gk20a_busy(g->dev);
+                err = gk20a_busy(g);
                 if (err) {
                         gk20a_err(g->dev,
                            "failed to host gk20a for ioctl cmd: 0x%x", cmd);
                         return err;
                 }
                 gk20a_enable_tsg(tsg);
-                gk20a_idle(g->dev);
+                gk20a_idle(g);
                 break;
                 }
 
         case NVGPU_IOCTL_TSG_DISABLE:
                 {
-                err = gk20a_busy(g->dev);
+                err = gk20a_busy(g);
                 if (err) {
                         gk20a_err(g->dev,
                            "failed to host gk20a for ioctl cmd: 0x%x", cmd);
                         return err;
                 }
                 gk20a_disable_tsg(tsg);
-                gk20a_idle(g->dev);
+                gk20a_idle(g);
                 break;
                 }
 
         case NVGPU_IOCTL_TSG_PREEMPT:
                 {
-                err = gk20a_busy(g->dev);
+                err = gk20a_busy(g);
                 if (err) {
                         gk20a_err(g->dev,
                            "failed to host gk20a for ioctl cmd: 0x%x", cmd);
@@ -702,7 +702,7 @@ long gk20a_tsg_dev_ioctl(struct file *filp, unsigned int cmd,
                 }
                 /* preempt TSG */
                 err = g->ops.fifo.preempt_tsg(g, tsg->tsgid);
-                gk20a_idle(g->dev);
+                gk20a_idle(g);
                 break;
                 }