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

Commit 944fc36c authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm: use upstream iommu 



Downstream kernel IOMMU had a non-standard way of dealing with multiple
devices and multiple ports/contexts.  We don't need that on upstream
kernel, so rip out the crazy.

Note that we have to move the pinning of the ringbuffer to after the
IOMMU is attached.  No idea how that managed to work properly on the
downstream kernel.

For now, I am leaving the IOMMU port name stuff in place, to simplify
things for folks trying to backport latest drm/msm to device kernels.
Once we no longer have to care about pre-DT kernels, we can drop this
and instead backport upstream IOMMU driver.

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 1c4997fe

drivers/gpu/drm/msm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
config DRM_MSM

	tristate "MSM DRM"

	depends on DRM

	depends on MSM_IOMMU

	depends on ARCH_QCOM || (ARM && COMPILE_TEST)

	select DRM_KMS_HELPER

	select SHMEM

drivers/gpu/drm/msm/adreno/adreno_gpu.c

+8 −0
Original line number Diff line number Diff line
@@ -91,9 +91,17 @@ int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value) 
int adreno_hw_init(struct msm_gpu *gpu)

{

	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);

	int ret;



	DBG("%s", gpu->name);



	ret = msm_gem_get_iova_locked(gpu->rb->bo, gpu->id, &gpu->rb_iova);

	if (ret) {

		gpu->rb_iova = 0;

		dev_err(gpu->dev->dev, "could not map ringbuffer: %d\n", ret);

		return ret;

	}



	/* Setup REG_CP_RB_CNTL: */

	gpu_write(gpu, REG_AXXX_CP_RB_CNTL,

			/* size is log2(quad-words): */

drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) 
	mdelay(16);



	if (config->iommu) {

		mmu = msm_iommu_new(dev, config->iommu);

		mmu = msm_iommu_new(&pdev->dev, config->iommu);

		if (IS_ERR(mmu)) {

			ret = PTR_ERR(mmu);

			goto fail;

drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev) 
	mdelay(16);



	if (config->iommu) {

		mmu = msm_iommu_new(dev, config->iommu);

		mmu = msm_iommu_new(&pdev->dev, config->iommu);

		if (IS_ERR(mmu)) {

			ret = PTR_ERR(mmu);

			dev_err(dev->dev, "failed to init iommu: %d\n", ret);

drivers/gpu/drm/msm/msm_gpu.c

+1 −8
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, 
	iommu = iommu_domain_alloc(&platform_bus_type);

	if (iommu) {

		dev_info(drm->dev, "%s: using IOMMU\n", name);

		gpu->mmu = msm_iommu_new(drm, iommu);

		gpu->mmu = msm_iommu_new(&pdev->dev, iommu);

	} else {

		dev_info(drm->dev, "%s: no IOMMU, fallback to VRAM carveout!\n", name);

	}
@@ -621,13 +621,6 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, 
		goto fail;

	}



	ret = msm_gem_get_iova_locked(gpu->rb->bo, gpu->id, &gpu->rb_iova);

	if (ret) {

		gpu->rb_iova = 0;

		dev_err(drm->dev, "could not map ringbuffer: %d\n", ret);

		goto fail;

	}



	bs_init(gpu);



	return 0;