commit c589ccb0b86b9310aa441a8c149b2775e1f22b60
author Jeremy Gebben <jgebben@codeaurora.org> Wed May 16 10:26:20 2012 -0600
committer Jeremy Gebben <jgebben@codeaurora.org> Thu May 17 15:07:34 2012 -0600
tree b57bcfb2045ea3970bd8d81b786b5b8c62d49ec0
parent ac45a2eff9cc69f0f87e79ea82bdf5eebef5bcc0

msm: kgsl: stop using gen_pool_alloc_aligned

All allocations made from the pool use the same alignment,
so it is simpler to just increase the overall pool order
to get the needed alignment.

Change-Id: I6de5069388bf8344d60902dedea795f7c5629f54
Signed-off-by: Jeremy Gebben <jgebben@codeaurora.org>

drivers/gpu/msm/kgsl_mmu.c

diff --git a/drivers/gpu/msm/kgsl_mmu.c b/drivers/gpu/msm/kgsl_mmu.c
index 606d861..43c5e4f 100644
--- a/drivers/gpu/msm/kgsl_mmu.c
+++ b/drivers/gpu/msm/kgsl_mmu.c
@@ -453,10 +453,11 @@
 	 */
 	if ((KGSL_MMU_TYPE_IOMMU == kgsl_mmu_get_mmutype()) &&
 		(KGSL_MMU_GLOBAL_PT == name)) {
-		pagetable->kgsl_pool = gen_pool_create(PAGE_SHIFT, -1);
+		pagetable->kgsl_pool = gen_pool_create(KGSL_MMU_ALIGN_SHIFT,
+						       -1);
 		if (pagetable->kgsl_pool == NULL) {
 			KGSL_CORE_ERR("gen_pool_create(%d) failed\n",
-					PAGE_SHIFT);
+					KGSL_MMU_ALIGN_SHIFT);
 			goto err_alloc;
 		}
 		if (gen_pool_add(pagetable->kgsl_pool,
@@ -467,9 +468,10 @@
 		}
 	}
 
-	pagetable->pool = gen_pool_create(PAGE_SHIFT, -1);
+	pagetable->pool = gen_pool_create(KGSL_MMU_ALIGN_SHIFT, -1);
 	if (pagetable->pool == NULL) {
-		KGSL_CORE_ERR("gen_pool_create(%d) failed\n", PAGE_SHIFT);
+		KGSL_CORE_ERR("gen_pool_create(%d) failed\n",
+			      KGSL_MMU_ALIGN_SHIFT);
 		goto err_kgsl_pool;
 	}
 
@@ -606,11 +608,11 @@
 	/* Allocate from kgsl pool if it exists for global mappings */
 	if (pagetable->kgsl_pool &&
 		(KGSL_MEMFLAGS_GLOBAL & memdesc->priv))
-		memdesc->gpuaddr = gen_pool_alloc_aligned(pagetable->kgsl_pool,
-			memdesc->size, KGSL_MMU_ALIGN_SHIFT);
+		memdesc->gpuaddr = gen_pool_alloc(pagetable->kgsl_pool,
+			memdesc->size);
 	else
-		memdesc->gpuaddr = gen_pool_alloc_aligned(pagetable->pool,
-			memdesc->size, KGSL_MMU_ALIGN_SHIFT);
+		memdesc->gpuaddr = gen_pool_alloc(pagetable->pool,
+			memdesc->size);
 
 	if (memdesc->gpuaddr == 0) {
 		KGSL_CORE_ERR("gen_pool_alloc(%d) failed from pool: %s\n",
@@ -679,12 +681,10 @@
 	if (pagetable->kgsl_pool &&
 		(KGSL_MEMFLAGS_GLOBAL & memdesc->priv))
 		gen_pool_free(pagetable->kgsl_pool,
-			memdesc->gpuaddr & KGSL_MMU_ALIGN_MASK,
-			memdesc->size);
+			memdesc->gpuaddr, memdesc->size);
 	else
 		gen_pool_free(pagetable->pool,
-			memdesc->gpuaddr & KGSL_MMU_ALIGN_MASK,
-			memdesc->size);
+			memdesc->gpuaddr, memdesc->size);
 
 	/*
 	 * Don't clear the gpuaddr on global mappings because they