msm: kgsl: remove *MMU type options from Kconfig
Remove the ability to switch between gpummu and iommu via
kernel config. The new decision path is: if kgsl.mmutype is set,
use that. Otherwise if iommu_found() use iommu, and last
but not least use the gpummu.
Change-Id: I6d34baf72da53e566bfa7081c6741f7fd0180aea
Signed-off-by: Jeremy Gebben <jgebben@codeaurora.org>
diff --git a/drivers/gpu/msm/kgsl_sharedmem.h b/drivers/gpu/msm/kgsl_sharedmem.h
index a9abcf9..d345ff3 100644
--- a/drivers/gpu/msm/kgsl_sharedmem.h
+++ b/drivers/gpu/msm/kgsl_sharedmem.h
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/dma-mapping.h>
+#include "kgsl_mmu.h"
struct kgsl_device;
struct kgsl_process_private;
@@ -94,11 +95,9 @@
kgsl_allocate(struct kgsl_memdesc *memdesc,
struct kgsl_pagetable *pagetable, size_t size)
{
-#ifdef CONFIG_MSM_KGSL_MMU
+ if (kgsl_mmu_get_mmutype() == KGSL_MMU_TYPE_NONE)
+ return kgsl_sharedmem_ebimem(memdesc, pagetable, size);
return kgsl_sharedmem_vmalloc(memdesc, pagetable, size);
-#else
- return kgsl_sharedmem_ebimem(memdesc, pagetable, size);
-#endif
}
static inline int
@@ -106,21 +105,18 @@
struct kgsl_pagetable *pagetable,
size_t size, unsigned int flags)
{
-#ifdef CONFIG_MSM_KGSL_MMU
+ if (kgsl_mmu_get_mmutype() == KGSL_MMU_TYPE_NONE)
+ return kgsl_sharedmem_ebimem_user(memdesc, pagetable, size,
+ flags);
return kgsl_sharedmem_vmalloc_user(memdesc, pagetable, size, flags);
-#else
- return kgsl_sharedmem_ebimem_user(memdesc, pagetable, size, flags);
-#endif
}
static inline int
kgsl_allocate_contiguous(struct kgsl_memdesc *memdesc, size_t size)
{
int ret = kgsl_sharedmem_alloc_coherent(memdesc, size);
-#ifndef CONFIG_MSM_KGSL_MMU
- if (!ret)
+ if (!ret && (kgsl_mmu_get_mmutype() == KGSL_MMU_TYPE_NONE))
memdesc->gpuaddr = memdesc->physaddr;
-#endif
return ret;
}