3 files changed, 4 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/include/nvgpu/channel.h b/drivers/gpu/nvgpu/include/nvgpu/channel.h
index cd4fadf8..8d2d9b44 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/channel.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/channel.h
@@ -243,7 +243,7 @@ struct channel_gk20a {
         nvgpu_atomic_t bound;
 
         int chid;
-        int tsgid;
+        u32 tsgid;
         pid_t pid;
         pid_t tgid;
         struct nvgpu_mutex ioctl_lock;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/tsg.h b/drivers/gpu/nvgpu/include/nvgpu/tsg.h
index bed84986..e87be90d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/tsg.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/tsg.h
@@ -28,7 +28,7 @@
 
 #include "gk20a/gr_gk20a.h"
 
-#define NVGPU_INVALID_TSG_ID (-1)
+#define NVGPU_INVALID_TSG_ID (U32_MAX)
 
 struct channel_gk20a;
 
@@ -68,7 +68,7 @@ struct tsg_gk20a {
         unsigned int timeslice_scale;
 
         u32 interleave_level;
-        int tsgid;
+        u32 tsgid;
 
         u32 runlist_id;
         pid_t tgid;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/types.h b/drivers/gpu/nvgpu/include/nvgpu/types.h
index 3295af26..0cb847b6 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/types.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/types.h
@@ -65,6 +65,7 @@
  */
 #if !defined(__KERNEL__) && !defined(U8_MAX)
 #define U8_MAX ((u8)255)
+#define U32_MAX         ((u32)~0U)
 #endif
 
 #endif /* NVGPU_TYPES_H */