diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2017-10-11 06:53:29 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-10-13 20:24:06 -0400 |
commit | 6bf323f3894bdcb95461cdf0f834cbef06e9e5d6 (patch) | |
tree | 8e3de26f9edaae9364b8a693987047ff9c4de7b5 /drivers/gpu/nvgpu/gk20a/gk20a.h | |
parent | e86e19c4fb839d31df390d4b2127cf1494ccad9c (diff) |
gpu: nvgpu: remove use of multichar constants
In gk20a.h, we use these multichar constants
'DONE', '0R32', '0W32'
But these constants fail compilation on some cross-os compilers
Hence remove them by creating a specific MULTICHAR_TAG()
All the User space components also form these constants in similar
fashion
Jira NVGPU-259
Change-Id: Ibe83617a8d15b657e450fdd59dbc171b3d822842
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1576933
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index bf10055a..cf13999a 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -1295,11 +1295,12 @@ static inline unsigned long gk20a_get_gr_idle_timeout(struct gk20a *g) | |||
1295 | g->gr_idle_timeout_default : ULONG_MAX; | 1295 | g->gr_idle_timeout_default : ULONG_MAX; |
1296 | } | 1296 | } |
1297 | 1297 | ||
1298 | #define MULTICHAR_TAG(a, b, c, d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) | ||
1298 | enum BAR0_DEBUG_OPERATION { | 1299 | enum BAR0_DEBUG_OPERATION { |
1299 | BARO_ZERO_NOP = 0, | 1300 | BARO_ZERO_NOP = 0, |
1300 | OP_END = 'DONE', | 1301 | OP_END = MULTICHAR_TAG('D', 'O', 'N', 'E'), |
1301 | BAR0_READ32 = '0R32', | 1302 | BAR0_READ32 = MULTICHAR_TAG('0', 'R', '3', '2'), |
1302 | BAR0_WRITE32 = '0W32', | 1303 | BAR0_WRITE32 = MULTICHAR_TAG('0', 'W', '3', '2'), |
1303 | }; | 1304 | }; |
1304 | 1305 | ||
1305 | struct share_buffer_head { | 1306 | struct share_buffer_head { |