4 files changed, 12 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/cde.c b/drivers/gpu/nvgpu/common/linux/cde.c
index 4911afa1..f3895d5c 100644
--- a/drivers/gpu/nvgpu/common/linux/cde.c
+++ b/drivers/gpu/nvgpu/common/linux/cde.c
@@ -31,6 +31,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/firmware.h>
+#include <nvgpu/os_sched.h>
 
 #include <nvgpu/linux/vm.h>
 
@@ -1287,7 +1288,7 @@ static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx)
                 return -ENOSYS;
         }
 
-        tsg = gk20a_tsg_open(g);
+        tsg = gk20a_tsg_open(g, nvgpu_current_pid(g));
         if (!tsg) {
                 nvgpu_err(g, "cde: could not create TSG");
                 err = -ENOMEM;
diff --git a/drivers/gpu/nvgpu/common/linux/channel.c b/drivers/gpu/nvgpu/common/linux/channel.c
index 70baeb2d..a360d0df 100644
--- a/drivers/gpu/nvgpu/common/linux/channel.c
+++ b/drivers/gpu/nvgpu/common/linux/channel.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA Corporation.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA Corporation.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -18,6 +18,7 @@
 #include <nvgpu/debug.h>
 #include <nvgpu/ltc.h>
 #include <nvgpu/error_notifier.h>
+#include <nvgpu/os_sched.h>
 
 /*
  * This is required for nvgpu_vm_find_buf() which is used in the tracing
@@ -251,7 +252,8 @@ struct channel_gk20a *gk20a_open_new_channel_with_cb(struct gk20a *g,
         struct channel_gk20a *ch;
         struct nvgpu_channel_linux *priv;
 
-        ch = gk20a_open_new_channel(g, runlist_id, is_privileged_channel);
+        ch = gk20a_open_new_channel(g, runlist_id, is_privileged_channel,
+                                nvgpu_current_pid(g), nvgpu_current_tid(g));
 
         if (ch) {
                 priv = ch->os_priv;
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
index 5b4dda6c..b4d7d501 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
@@ -1,7 +1,7 @@
 /*
  * GK20A Graphics channel
  *
- * Copyright (c) 2011-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2011-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -33,6 +33,7 @@
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/barrier.h>
 #include <nvgpu/nvhost.h>
+#include <nvgpu/os_sched.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
@@ -495,7 +496,8 @@ static int __gk20a_channel_open(struct gk20a *g,
                 goto fail_busy;
         }
         /* All the user space channel should be non privilege */
-        ch = gk20a_open_new_channel(g, runlist_id, false);
+        ch = gk20a_open_new_channel(g, runlist_id, false,
+                                nvgpu_current_pid(g), nvgpu_current_tid(g));
         gk20a_idle(g);
         if (!ch) {
                 nvgpu_err(g,
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c
index 60aca5ec..be2315bd 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c
@@ -24,6 +24,7 @@
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/log.h>
+#include <nvgpu/os_sched.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/tsg_gk20a.h"
@@ -370,7 +371,7 @@ int nvgpu_ioctl_tsg_open(struct gk20a *g, struct file *filp)
                 goto free_ref;
         }
 
-        tsg = gk20a_tsg_open(g);
+        tsg = gk20a_tsg_open(g, nvgpu_current_pid(g));
         if (!tsg) {
                 nvgpu_kfree(g, priv);
                 err = -ENOMEM;