commit f764e4642a18672b9b53f14b63d36d7d3e624c13
author Shubhraprakash Das <sadas@codeaurora.org> Thu Apr 26 15:38:09 2012 -0600
committer Linux Build Service Account <lnxbuild@localhost> Sat Apr 28 07:12:52 2012 -0600
tree 6a4ee6f32db56b39f61985c38756db6ca8d1f1e6
parent 9d7e145ec8fe5b0b3ce16719e9d8494b56f130d8

msm: kgsl: Make tlb flags common for all MMU types

Remove tlb flags variable from gpu MMU specific structure and
declare it in common MMU structure since it can be used by both
MMU types i.e GPUMMU and IOMMU

Change-Id: Ia8bea65bc9acf257dc1277c98cd358963c291fd7
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>

drivers/gpu/msm/kgsl_mmu.h

diff --git a/drivers/gpu/msm/kgsl_mmu.h b/drivers/gpu/msm/kgsl_mmu.h
index bff41bf..63ecdd6 100644
--- a/drivers/gpu/msm/kgsl_mmu.h
+++ b/drivers/gpu/msm/kgsl_mmu.h
@@ -112,6 +112,7 @@
 		unsigned int max_entries;
 	} stats;
 	const struct kgsl_mmu_pt_ops *pt_ops;
+	unsigned int tlb_flags;
 	void *priv;
 };
 
@@ -132,15 +133,14 @@
 struct kgsl_mmu_pt_ops {
 	int (*mmu_map) (void *mmu_pt,
 			struct kgsl_memdesc *memdesc,
-			unsigned int protflags);
+			unsigned int protflags,
+			unsigned int *tlb_flags);
 	int (*mmu_unmap) (void *mmu_pt,
 			struct kgsl_memdesc *memdesc);
 	void *(*mmu_create_pagetable) (void);
 	void (*mmu_destroy_pagetable) (void *pt);
 	int (*mmu_pt_equal) (struct kgsl_pagetable *pt,
 			unsigned int pt_base);
-	unsigned int (*mmu_pt_get_flags) (struct kgsl_pagetable *pt,
-				enum kgsl_deviceid id);
 };
 
 struct kgsl_mmu {