2 files changed, 21 insertions, 11 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/channel.c b/drivers/gpu/nvgpu/common/linux/channel.c
index 1e170b30..f189d3ed 100644
--- a/drivers/gpu/nvgpu/common/linux/channel.c
+++ b/drivers/gpu/nvgpu/common/linux/channel.c
@@ -64,9 +64,6 @@ u32 nvgpu_submit_gpfifo_user_flags_to_common_flags(u32 user_flags)
         if (user_flags & NVGPU_SUBMIT_GPFIFO_FLAGS_SKIP_BUFFER_REFCOUNTING)
                 flags |= NVGPU_SUBMIT_FLAGS_SKIP_BUFFER_REFCOUNTING;
 
-        if (user_flags & NVGPU_SUBMIT_GPFIFO_FLAGS_RESCHEDULE_RUNLIST)
-                flags |= NVGPU_SUBMIT_FLAGS_RESCHEDULE_RUNLIST;
-
         return flags;
 }
 
@@ -1008,10 +1005,6 @@ int gk20a_submit_channel_gpfifo(struct channel_gk20a *c,
 
         g->ops.fifo.userd_gp_put(g, c);
 
-        if ((NVGPU_SUBMIT_FLAGS_RESCHEDULE_RUNLIST & flags) &&
-                g->ops.fifo.reschedule_runlist)
-                g->ops.fifo.reschedule_runlist(g, c->runlist_id);
-
         /* No hw access beyond this point */
         if (c->deterministic)
                 nvgpu_rwsem_up_read(&g->deterministic_busy);
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
index 606c5251..c1492cad 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
@@ -789,10 +789,6 @@ static int gk20a_ioctl_channel_submit_gpfifo(
         if (ch->has_timedout)
                 return -ETIMEDOUT;
 
-        if ((NVGPU_SUBMIT_GPFIFO_FLAGS_RESCHEDULE_RUNLIST & args->flags) &&
-                !capable(CAP_SYS_NICE))
-                return -EPERM;
-
         nvgpu_get_fence_args(&args->fence, &fence);
         submit_flags =
                 nvgpu_submit_gpfifo_user_flags_to_common_flags(args->flags);
@@ -1291,6 +1287,27 @@ long gk20a_channel_ioctl(struct file *filp,
                 err = gk20a_fifo_preempt(ch->g, ch);
                 gk20a_idle(ch->g);
                 break;
+        case NVGPU_IOCTL_CHANNEL_RESCHEDULE_RUNLIST:
+                if (!capable(CAP_SYS_NICE)) {
+                        err = -EPERM;
+                        break;
+                }
+                if (!ch->g->ops.fifo.reschedule_runlist) {
+                        err = -ENOSYS;
+                        break;
+                }
+                err = gk20a_busy(ch->g);
+                if (err) {
+                        dev_err(dev,
+                                "%s: failed to host gk20a for ioctl cmd: 0x%x",
+                                __func__, cmd);
+                        break;
+                }
+                err = ch->g->ops.fifo.reschedule_runlist(ch,
+                        NVGPU_RESCHEDULE_RUNLIST_PREEMPT_NEXT &
+                        ((struct nvgpu_reschedule_runlist_args *)buf)->flags);
+                gk20a_idle(ch->g);
+                break;
         case NVGPU_IOCTL_CHANNEL_FORCE_RESET:
                 err = gk20a_busy(ch->g);
                 if (err) {