diff options
author | Ari Hirvonen <ahirvonen@nvidia.com> | 2015-11-19 04:12:26 -0500 |
---|---|---|
committer | Arto Merilainen <amerilainen@nvidia.com> | 2015-11-20 07:57:01 -0500 |
commit | 938b16909f85231a8c62d563b603ed93862c8ed8 (patch) | |
tree | 70e95481d73af23077c0730bedd4f517f46f14f0 /drivers/gpu | |
parent | acde16dd16012004efa1edb9dc9813f0c62622e4 (diff) |
gpu: nvgpu: Fix alignment calculation overflow
Bug 200150865
Change-Id: If4f0e01bdeb95c303675b63444bd497b65d934f3
Signed-off-by: Ari Hirvonen <ahirvonen@nvidia.com>
Reviewed-on: http://git-master/r/835151
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index a9bca317..86b9f045 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -1473,7 +1473,7 @@ u64 gk20a_vm_map(struct vm_gk20a *vm, | |||
1473 | 1473 | ||
1474 | buf_addr = (u64)sg_phys(sgl); | 1474 | buf_addr = (u64)sg_phys(sgl); |
1475 | 1475 | ||
1476 | align = 1 << __ffs(buf_addr | (u64)sgl->length); | 1476 | align = 1ULL << __ffs(buf_addr | (u64)sgl->length); |
1477 | if (bfr.align) | 1477 | if (bfr.align) |
1478 | bfr.align = min_t(u64, align, bfr.align); | 1478 | bfr.align = min_t(u64, align, bfr.align); |
1479 | else | 1479 | else |
@@ -1481,7 +1481,7 @@ u64 gk20a_vm_map(struct vm_gk20a *vm, | |||
1481 | sgl = sg_next(sgl); | 1481 | sgl = sg_next(sgl); |
1482 | } | 1482 | } |
1483 | } else | 1483 | } else |
1484 | bfr.align = 1 << __ffs(buf_addr); | 1484 | bfr.align = 1ULL << __ffs(buf_addr); |
1485 | 1485 | ||
1486 | bfr.pgsz_idx = -1; | 1486 | bfr.pgsz_idx = -1; |
1487 | mapping_size = mapping_size ? mapping_size : bfr.size; | 1487 | mapping_size = mapping_size ? mapping_size : bfr.size; |