diff options
author | Seema Khowala <seemaj@nvidia.com> | 2017-03-06 19:27:06 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-03-30 19:39:17 -0400 |
commit | 5032125551dbd511303a3803c75bab8616e22918 (patch) | |
tree | 1be39400ecf2d133946082c168a8f6006a384e8d /drivers | |
parent | f21659431f47722bc7596aa72d22a268967ea696 (diff) |
gpu: nvgpu: function to combine two u32 into u64
New function to combine two u32 values into one u64.
This is introduced for t19x mmu fault handling.
JIRA GPUT19X-7
Change-Id: I4cd1e5764c07f43fe96e487acfa781b6ebb7c57f
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: http://git-master/r/1315951
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index d781034c..88acc3ec 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -1366,6 +1366,11 @@ static inline u32 u64_lo32(u64 n) | |||
1366 | return (u32)(n & ~(u32)0); | 1366 | return (u32)(n & ~(u32)0); |
1367 | } | 1367 | } |
1368 | 1368 | ||
1369 | static inline u64 hi32_lo32_to_u64(u32 hi, u32 lo) | ||
1370 | { | ||
1371 | return (((u64)hi) << 32) | (u64)lo; | ||
1372 | } | ||
1373 | |||
1369 | static inline u32 set_field(u32 val, u32 mask, u32 field) | 1374 | static inline u32 set_field(u32 val, u32 mask, u32 field) |
1370 | { | 1375 | { |
1371 | return ((val & ~mask) | field); | 1376 | return ((val & ~mask) | field); |