Merge "msm: kgsl: Remove unused sharedmem functions" (c9c6785e) · Commits · e / devices / android_kernel_sony_msm8994

drivers/gpu/msm/kgsl_sharedmem.c

+0 −20

Original line number	Diff line number	Diff line
		@@ -752,26 +752,6 @@ done:
		return ret;
		}

		int
		kgsl_sharedmem_page_alloc(struct kgsl_memdesc *memdesc,
		struct kgsl_pagetable *pagetable, size_t size)
		{
		int ret = 0;
		BUG_ON(size == 0);

		size = ALIGN(size, PAGE_SIZE * 2);
		if (size == 0)
		return -EINVAL;

		ret = _kgsl_sharedmem_page_alloc(memdesc, pagetable, size);
		if (!ret)
		ret = kgsl_page_alloc_map_kernel(memdesc);
		if (ret)
		kgsl_sharedmem_free(memdesc);
		return ret;
		}
		EXPORT_SYMBOL(kgsl_sharedmem_page_alloc);

		int
		kgsl_sharedmem_page_alloc_user(struct kgsl_memdesc *memdesc,
		struct kgsl_pagetable *pagetable,

+0 −28

Original line number	Diff line number	Diff line
		@@ -29,9 +29,6 @@ struct kgsl_process_private;
		#define KGSL_CACHE_OP_FLUSH 0x02
		#define KGSL_CACHE_OP_CLEAN 0x03

		int kgsl_sharedmem_page_alloc(struct kgsl_memdesc *memdesc,
		struct kgsl_pagetable *pagetable, size_t size);

		int kgsl_sharedmem_page_alloc_user(struct kgsl_memdesc *memdesc,
		struct kgsl_pagetable *pagetable,
		size_t size);
		@@ -207,31 +204,6 @@ kgsl_memdesc_mmapsize(const struct kgsl_memdesc *memdesc)
		return size;
		}

		static inline int
		kgsl_allocate(struct kgsl_device device, struct kgsl_memdesc memdesc,
		struct kgsl_pagetable *pagetable, size_t size)
		{
		int ret;
		memdesc->priv \|= (KGSL_MEMTYPE_KERNEL << KGSL_MEMTYPE_SHIFT);
		if (kgsl_mmu_get_mmutype() == KGSL_MMU_TYPE_NONE) {
		size = ALIGN(size, PAGE_SIZE * 2);
		return kgsl_cma_alloc_coherent(device, memdesc, pagetable,
		size);
		}
		ret = kgsl_sharedmem_page_alloc(memdesc, pagetable, size);
		if (ret)
		return ret;
		ret = kgsl_mmu_get_gpuaddr(pagetable, memdesc);
		if (ret) {
		kgsl_sharedmem_free(memdesc);
		return ret;
		}
		ret = kgsl_mmu_map(pagetable, memdesc);
		if (ret)
		kgsl_sharedmem_free(memdesc);
		return ret;
		}

		static inline int
		kgsl_allocate_user(struct kgsl_device *device,
		struct kgsl_memdesc *memdesc,