Commit 30480e6e authored by Jordan Crouse's avatar Jordan Crouse Committed by Rob Clark
Browse files

drm/msm: Fix up the rest of the messed up address sizes 



msm_gem_address_space_create() changed to take a start/length instead
of a start/end for the iova space but all of the callers were just
cut and pasted from the old usage. Most of the mistakes have been fixed
up so just catch up the rest.

Fixes: ccac7ce3 ("drm/msm: Refactor address space initialization")
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 078e8f8c

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

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ a2xx_create_address_space(struct msm_gpu *gpu, struct platform_device *pdev) 
	struct msm_gem_address_space *aspace;



	aspace = msm_gem_address_space_create(mmu, "gpu", SZ_16M,

		SZ_16M + 0xfff * SZ_64K);

		0xfff * SZ_64K);



	if (IS_ERR(aspace) && !IS_ERR(mmu))

		mmu->funcs->destroy(mmu);

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

+1 −1
Original line number Diff line number Diff line
@@ -1121,7 +1121,7 @@ static int a6xx_gmu_memory_probe(struct a6xx_gmu *gmu) 
		return -ENODEV;



	mmu = msm_iommu_new(gmu->dev, domain);

	gmu->aspace = msm_gem_address_space_create(mmu, "gmu", 0x0, 0x7fffffff);

	gmu->aspace = msm_gem_address_space_create(mmu, "gmu", 0x0, 0x80000000);

	if (IS_ERR(gmu->aspace)) {

		iommu_domain_free(domain);

		return PTR_ERR(gmu->aspace);

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -780,7 +780,7 @@ static int _dpu_kms_mmu_init(struct dpu_kms *dpu_kms) 


	mmu = msm_iommu_new(dpu_kms->dev->dev, domain);

	aspace = msm_gem_address_space_create(mmu, "dpu1",

		0x1000, 0xfffffff);

		0x1000, 0x100000000 - 0x1000);



	if (IS_ERR(aspace)) {

		mmu->funcs->destroy(mmu);

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

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) 
			config->iommu);



		aspace  = msm_gem_address_space_create(mmu,

			"mdp4", 0x1000, 0xffffffff);

			"mdp4", 0x1000, 0x100000000 - 0x1000);



		if (IS_ERR(aspace)) {

			if (!IS_ERR(mmu))

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

+1 −1
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev) 
		mmu = msm_iommu_new(iommu_dev, config->platform.iommu);



		aspace = msm_gem_address_space_create(mmu, "mdp5",

			0x1000, 0xffffffff);

			0x1000, 0x100000000 - 0x1000);



		if (IS_ERR(aspace)) {

			if (!IS_ERR(mmu))