diff options
author | Sri Krishna Chowdary <schowdary@nvidia.com> | 2015-09-07 02:14:26 -0400 |
---|---|---|
committer | Sri Krishna Chowdary <schowdary@nvidia.com> | 2015-09-07 02:56:01 -0400 |
commit | 57034b22ca17b217b683941dcebc0d69587d7d5e (patch) | |
tree | 549ea910d4de7dde2d335e3f0198baab51354177 /drivers | |
parent | 47afbb71ead31e5378b9dddf22f92a5ff9bb9d6b (diff) |
Revert "gpu: nvgpu: fix alignment calculation"
This reverts commit b12efd059070b942a33e23d06e9050145a0694ef.
Bug 1492689
Change-Id: Iae07341f246010ca0b69eddbbb9cd434b8b5f05a
Signed-off-by: Sri Krishna chowdary <schowdary@nvidia.com>
Reviewed-on: http://git-master/r/795112
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 37151cda..b12091bf 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -1423,7 +1423,7 @@ u64 gk20a_vm_map(struct vm_gk20a *vm, | |||
1423 | sgl = sg_next(sgl); | 1423 | sgl = sg_next(sgl); |
1424 | } | 1424 | } |
1425 | } else | 1425 | } else |
1426 | bfr.align = 1 << __ffs(buf_addr | bfr.size); | 1426 | bfr.align = 1 << __ffs(buf_addr); |
1427 | 1427 | ||
1428 | bfr.pgsz_idx = -1; | 1428 | bfr.pgsz_idx = -1; |
1429 | mapping_size = mapping_size ? mapping_size : bfr.size; | 1429 | mapping_size = mapping_size ? mapping_size : bfr.size; |