From 57034b22ca17b217b683941dcebc0d69587d7d5e Mon Sep 17 00:00:00 2001 From: Sri Krishna Chowdary Date: Sun, 6 Sep 2015 23:14:26 -0700 Subject: Revert "gpu: nvgpu: fix alignment calculation" This reverts commit b12efd059070b942a33e23d06e9050145a0694ef. Bug 1492689 Change-Id: Iae07341f246010ca0b69eddbbb9cd434b8b5f05a Signed-off-by: Sri Krishna chowdary Reviewed-on: http://git-master/r/795112 Reviewed-by: Sachin Nikam --- drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, sgl = sg_next(sgl); } } else - bfr.align = 1 << __ffs(buf_addr | bfr.size); + bfr.align = 1 << __ffs(buf_addr); bfr.pgsz_idx = -1; mapping_size = mapping_size ? mapping_size : bfr.size; -- cgit v1.2.2