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

Commit e22a2fb8 authored by Rob Clark's avatar Rob Clark Committed by Gerrit - the friendly Code Review server
Browse files

drm/msm: support multiple address spaces 



We can have various combinations of 64b and 32b address space, ie. 64b
CPU but 32b display and gpu, or 64b CPU and GPU but 32b display.  So
best to decouple the device iova's from mmap offset.

CRs-Fixed: 2050484
Change-Id: Ic0dedbad2b36b535df3e8fb2ddddc20add592cea
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
Git-commit: 22877bcbdacd50d076f9b2f829e6a3753aa9821f
Git-repo: https://github.com/freedreno/kernel-msm.git


[jcrouse@codeaurora.org: Fix merge conflicts, remove mdp5 due to large
infrastructure changes, compile fixes]
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
[kabhijit@codeaurora.org: Fix merge conflicts, add support for SDE,
compile fixes]
Signed-off-by: default avatarAbhijit Kulkarni <kabhijit@codeaurora.org>
parent a375c882

drivers/gpu/drm/msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ msm_drm-$(CONFIG_DRM_MSM) += \ 
	msm_gem_prime.o \

	msm_gem_submit.o \

	msm_gem_shrinker.o \

	msm_gem_vma.o \

	msm_gpu.o \

	msm_iommu.o \

	msm_smmu.o \

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

+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ struct msm_gpu *a3xx_gpu_init(struct drm_device *dev) 
#endif

	}



	if (!gpu->mmu) {

	if (!gpu->aspace) {

		/* TODO we think it is possible to configure the GPU to

		 * restrict access to VRAM carveout.  But the required

		 * registers are unknown.  For now just bail out and

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

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ struct msm_gpu *a4xx_gpu_init(struct drm_device *dev) 
#endif

	}



	if (!gpu->mmu) {

	if (!gpu->aspace) {

		/* TODO we think it is possible to configure the GPU to

		 * restrict access to VRAM carveout.  But the required

		 * registers are unknown.  For now just bail out and

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

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, 
		return ret;

	}



	mmu = gpu->mmu;

	mmu = gpu->aspace->mmu;

	if (mmu) {

		ret = mmu->funcs->attach(mmu, iommu_ports,

				ARRAY_SIZE(iommu_ports));

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

+28 −9
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 




#include "msm_drv.h"

#include "msm_gem.h"

#include "msm_mmu.h"

#include "mdp4_kms.h"
@@ -151,9 +152,22 @@ static long mdp4_round_pixclk(struct msm_kms *kms, unsigned long rate, 
	}

}



static const char * const iommu_ports[] = {

	"mdp_port0_cb0", "mdp_port1_cb0",

};

static void mdp4_preclose(struct msm_kms *kms, struct drm_file *file)

{

	struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms));

	struct msm_drm_private *priv = mdp4_kms->dev->dev_private;

	unsigned int i;

	struct msm_gem_address_space *aspace = mdp4_kms->aspace;



	for (i = 0; i < priv->num_crtcs; i++)

		mdp4_crtc_cancel_pending_flip(priv->crtcs[i], file);



	if (aspace) {

		aspace->mmu->funcs->detach(aspace->mmu,

				iommu_ports, ARRAY_SIZE(iommu_ports));

		msm_gem_address_space_destroy(aspace);

	}

}



static void mdp4_destroy(struct msm_kms *kms)

{
@@ -442,6 +456,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) 
	struct msm_kms *kms = NULL;

	struct msm_mmu *mmu;

	int irq, ret;

	struct msm_gem_address_space *aspace;



	mdp4_kms = kzalloc(sizeof(*mdp4_kms), GFP_KERNEL);

	if (!mdp4_kms) {
@@ -531,12 +546,16 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) 
	mdelay(16);



	if (config->iommu) {

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

		if (IS_ERR(mmu)) {

			ret = PTR_ERR(mmu);

		aspace = msm_gem_address_space_create(&pdev->dev,

				config->iommu, "mdp4");

		if (IS_ERR(aspace)) {

			ret = PTR_ERR(aspace);

			goto fail;

		}

		ret = mmu->funcs->attach(mmu, iommu_ports,



		mdp4_kms->aspace = aspace;



		ret = aspace->mmu->funcs->attach(aspace->mmu, iommu_ports,

				ARRAY_SIZE(iommu_ports));

		if (ret)

			goto fail;
@@ -545,10 +564,10 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) 
	} else {

		dev_info(dev->dev, "no iommu, fallback to phys "

				"contig buffers for scanout\n");

		mmu = NULL;

		aspace = NULL;

	}



	mdp4_kms->id = msm_register_mmu(dev, mmu);

	mdp4_kms->id = msm_register_address_space(dev, aspace);

	if (mdp4_kms->id < 0) {

		ret = mdp4_kms->id;

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