drm/msm: Pass the correct aperture end to drm_mm_init

drm_mm_init() takes the start and length of the intended virtual
memory address region but the msm code is passing the end of
the region instead. That would work out if the region started
at 0 but it doesn't so the top of the region sneaks above the
32 bit boundary which won't work because the driver doesn't
support 64 bit addresses for the GPU yet.

Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c
index d34e331554f3903eaded86cf12fdd4a4ef24507a..ffbec224551b52f927eebb92b4319134b3399e2c 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gem_vma.c
+++ b/drivers/gpu/drm/msm/msm_gem_vma.c
@@ -96,6 +96,8 @@ msm_gem_address_space_create(struct device *dev, struct iommu_domain *domain,
                const char *name)
 {
        struct msm_gem_address_space *aspace;
+       u64 size = domain->geometry.aperture_end -
+               domain->geometry.aperture_start;
 
        aspace = kzalloc(sizeof(*aspace), GFP_KERNEL);
        if (!aspace)
@@ -106,7 +108,7 @@ msm_gem_address_space_create(struct device *dev, struct iommu_domain *domain,
        aspace->mmu = msm_iommu_new(dev, domain);
 
        drm_mm_init(&aspace->mm, (domain->geometry.aperture_start >> PAGE_SHIFT),
-                       (domain->geometry.aperture_end >> PAGE_SHIFT) - 1);
+               size >> PAGE_SHIFT);
 
        kref_init(&aspace->kref);