Skip to content

Commit 30480e6

Browse files
Jordan Crouserobclark
authored andcommitted
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: ccac7ce ("drm/msm: Refactor address space initialization") Signed-off-by: Jordan Crouse <[email protected]> Signed-off-by: Rob Clark <[email protected]>
1 parent 078e8f8 commit 30480e6

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ a2xx_create_address_space(struct msm_gpu *gpu, struct platform_device *pdev)
408408
struct msm_gem_address_space *aspace;
409409

410410
aspace = msm_gem_address_space_create(mmu, "gpu", SZ_16M,
411-
SZ_16M + 0xfff * SZ_64K);
411+
0xfff * SZ_64K);
412412

413413
if (IS_ERR(aspace) && !IS_ERR(mmu))
414414
mmu->funcs->destroy(mmu);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,7 @@ static int a6xx_gmu_memory_probe(struct a6xx_gmu *gmu)
11211121
return -ENODEV;
11221122

11231123
mmu = msm_iommu_new(gmu->dev, domain);
1124-
gmu->aspace = msm_gem_address_space_create(mmu, "gmu", 0x0, 0x7fffffff);
1124+
gmu->aspace = msm_gem_address_space_create(mmu, "gmu", 0x0, 0x80000000);
11251125
if (IS_ERR(gmu->aspace)) {
11261126
iommu_domain_free(domain);
11271127
return PTR_ERR(gmu->aspace);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ static int _dpu_kms_mmu_init(struct dpu_kms *dpu_kms)
780780

781781
mmu = msm_iommu_new(dpu_kms->dev->dev, domain);
782782
aspace = msm_gem_address_space_create(mmu, "dpu1",
783-
0x1000, 0xfffffff);
783+
0x1000, 0x100000000 - 0x1000);
784784

785785
if (IS_ERR(aspace)) {
786786
mmu->funcs->destroy(mmu);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev)
514514
config->iommu);
515515

516516
aspace = msm_gem_address_space_create(mmu,
517-
"mdp4", 0x1000, 0xffffffff);
517+
"mdp4", 0x1000, 0x100000000 - 0x1000);
518518

519519
if (IS_ERR(aspace)) {
520520
if (!IS_ERR(mmu))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
641641
mmu = msm_iommu_new(iommu_dev, config->platform.iommu);
642642

643643
aspace = msm_gem_address_space_create(mmu, "mdp5",
644-
0x1000, 0xffffffff);
644+
0x1000, 0x100000000 - 0x1000);
645645

646646
if (IS_ERR(aspace)) {
647647
if (!IS_ERR(mmu))

0 commit comments

Comments
 (0)