Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33b3587e authored by Shrenuj Bansal's avatar Shrenuj Bansal
Browse files

msm: kgsl: Make the dma_set_coherent_mask call universal 



Now that we are required to send a non-NULL device ptr to
dma_alloc_coherent(), we need to interrogate the kernel to see if
the DMA controller can properly support the device's addressing
limitation. Therefore, moving the dma_set_coherent_mask to
adreno_probe before we allocate the ringbuffer.

Change-Id: I29e9c77e7551bc3447877aa5570e4d89fbb94a2e
Signed-off-by: default avatarShrenuj Bansal <shrenujb@codeaurora.org>
parent b8ea0b94

drivers/gpu/msm/kgsl.c

+11 −0
Original line number Diff line number Diff line
@@ -57,6 +57,12 @@ 
#define pgprot_writethroughcache(_prot)	(_prot)

#endif



#ifdef CONFIG_ARM_LPAE

#define KGSL_DMA_BIT_MASK	DMA_BIT_MASK(64)

#else

#define KGSL_DMA_BIT_MASK	DMA_BIT_MASK(32)

#endif



static char *ksgl_mmu_type;

module_param_named(mmutype, ksgl_mmu_type, charp, 0);

MODULE_PARM_DESC(ksgl_mmu_type,
@@ -4213,6 +4219,11 @@ int kgsl_device_platform_probe(struct kgsl_device *device) 
		goto error_dest_work_q;

	}



	/* Check to see if our device can perform DMA correctly */

	status = dma_set_coherent_mask(&pdev->dev, KGSL_DMA_BIT_MASK);

	if (status)

		goto error_close_mmu;



	status = kgsl_allocate_contiguous(device, &device->memstore,

		KGSL_MEMSTORE_SIZE);

drivers/gpu/msm/kgsl_mmu.c

+3 −7
Original line number Diff line number Diff line
@@ -380,15 +380,11 @@ int kgsl_mmu_init(struct kgsl_device *device) 
	kgsl_sharedmem_set(device, &mmu->setstate_memory, 0, 0,

				mmu->setstate_memory.size);



	if (KGSL_MMU_TYPE_NONE == kgsl_mmu_type) {

		status = dma_set_coherent_mask(device->dev->parent,

					DMA_BIT_MASK(sizeof(dma_addr_t)*8));

		goto done;

	} else if (KGSL_MMU_TYPE_IOMMU == kgsl_mmu_type)

	if (KGSL_MMU_TYPE_IOMMU == kgsl_mmu_type) {

		mmu->mmu_ops = &iommu_ops;



		status =  mmu->mmu_ops->mmu_init(mmu);

done:

	}



	if (status)

		kgsl_sharedmem_free(&mmu->setstate_memory);

	return status;