summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/include
diff options
context:
space:
mode:
authorPhilip Elcan <pelcan@nvidia.com>2018-10-03 14:46:57 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2019-02-05 12:04:02 -0500
commitbace52ac7a5ee8683bedba23721900724e3de30a (patch)
tree1085ef171203233f4498795469f175634c4e85ea /drivers/gpu/nvgpu/include
parentaa84e8a9867fdc72812f2609c142bdd21e5d03de (diff)
gpu: nvgpu: make tsgid a consistent type
Different units were declaring tsgid as int or u32. This makes everyone use u32. This change resolves MISRA 10.3 violations for implicit assingment to different types. JIRA NVGPU-647 Change-Id: I78660e737acb0dad76dd538e5dd37f4527cf5acd Signed-off-by: Philip Elcan <pelcan@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1918469 Signed-off-by: Debarshi Dutta <ddutta@nvidia.com> (cherry picked from commit f5cac144a04a3ef83762ecb2e3f405196beffd68 in dev-kernel) Reviewed-on: https://git-master.nvidia.com/r/2008513 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/include')
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/channel.h2
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/tsg.h4
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/types.h1
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 {
243 nvgpu_atomic_t bound; 243 nvgpu_atomic_t bound;
244 244
245 int chid; 245 int chid;
246 int tsgid; 246 u32 tsgid;
247 pid_t pid; 247 pid_t pid;
248 pid_t tgid; 248 pid_t tgid;
249 struct nvgpu_mutex ioctl_lock; 249 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 @@
28 28
29#include "gk20a/gr_gk20a.h" 29#include "gk20a/gr_gk20a.h"
30 30
31#define NVGPU_INVALID_TSG_ID (-1) 31#define NVGPU_INVALID_TSG_ID (U32_MAX)
32 32
33struct channel_gk20a; 33struct channel_gk20a;
34 34
@@ -68,7 +68,7 @@ struct tsg_gk20a {
68 unsigned int timeslice_scale; 68 unsigned int timeslice_scale;
69 69
70 u32 interleave_level; 70 u32 interleave_level;
71 int tsgid; 71 u32 tsgid;
72 72
73 u32 runlist_id; 73 u32 runlist_id;
74 pid_t tgid; 74 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 @@
65 */ 65 */
66#if !defined(__KERNEL__) && !defined(U8_MAX) 66#if !defined(__KERNEL__) && !defined(U8_MAX)
67#define U8_MAX ((u8)255) 67#define U8_MAX ((u8)255)
68#define U32_MAX ((u32)~0U)
68#endif 69#endif
69 70
70#endif /* NVGPU_TYPES_H */ 71#endif /* NVGPU_TYPES_H */