Commit 2ee4b5d2 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/gem: Drop PAGE_SHIFT for address space mm 



Get rid of all the unnecessary conversion between address/size and page
offsets.  It just confuses things.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20220411215849.297838-6-robdclark@gmail.com


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent ca35ab2a

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

+1 −1
Original line number Diff line number Diff line
@@ -1172,7 +1172,7 @@ static int a6xx_gmu_memory_alloc(struct a6xx_gmu *gmu, struct a6xx_gmu_bo *bo, 
		return PTR_ERR(bo->obj);



	ret = msm_gem_get_and_pin_iova_range(bo->obj, gmu->aspace, &bo->iova,

		range_start >> PAGE_SHIFT, range_end >> PAGE_SHIFT);

					     range_start, range_end);

	if (ret) {

		drm_gem_object_put(bo->obj);

		return ret;

drivers/gpu/drm/msm/msm_gem.c

+2 −3
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static int get_iova_locked(struct drm_gem_object *obj, 
		if (IS_ERR(vma))

			return PTR_ERR(vma);



		ret = msm_gem_init_vma(aspace, vma, obj->size >> PAGE_SHIFT,

		ret = msm_gem_init_vma(aspace, vma, obj->size,

			range_start, range_end);

		if (ret) {

			del_vma(vma);
@@ -434,8 +434,7 @@ static int msm_gem_pin_iova(struct drm_gem_object *obj, 
	if (IS_ERR(pages))

		return PTR_ERR(pages);



	ret = msm_gem_map_vma(aspace, vma, prot,

			msm_obj->sgt, obj->size >> PAGE_SHIFT);

	ret = msm_gem_map_vma(aspace, vma, prot, msm_obj->sgt, obj->size);



	if (!ret)

		msm_obj->pin_count++;

drivers/gpu/drm/msm/msm_gem.h

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ struct msm_gem_vma { 
};



int msm_gem_init_vma(struct msm_gem_address_space *aspace,

		struct msm_gem_vma *vma, int npages,

		struct msm_gem_vma *vma, int size,

		u64 range_start, u64 range_end);

bool msm_gem_vma_inuse(struct msm_gem_vma *vma);

void msm_gem_purge_vma(struct msm_gem_address_space *aspace,
@@ -68,7 +68,7 @@ void msm_gem_unmap_vma(struct msm_gem_address_space *aspace, 
		struct msm_gem_vma *vma);

int msm_gem_map_vma(struct msm_gem_address_space *aspace,

		struct msm_gem_vma *vma, int prot,

		struct sg_table *sgt, int npages);

		struct sg_table *sgt, int size);

void msm_gem_close_vma(struct msm_gem_address_space *aspace,

		struct msm_gem_vma *vma);

drivers/gpu/drm/msm/msm_gem_vma.c

+8 −8
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ bool msm_gem_vma_inuse(struct msm_gem_vma *vma) 
void msm_gem_purge_vma(struct msm_gem_address_space *aspace,

		struct msm_gem_vma *vma)

{

	unsigned size = vma->node.size << PAGE_SHIFT;

	unsigned size = vma->node.size;



	/* Print a message if we try to purge a vma in use */

	if (GEM_WARN_ON(msm_gem_vma_inuse(vma)))
@@ -73,9 +73,8 @@ void msm_gem_unmap_vma(struct msm_gem_address_space *aspace, 
int

msm_gem_map_vma(struct msm_gem_address_space *aspace,

		struct msm_gem_vma *vma, int prot,

		struct sg_table *sgt, int npages)

		struct sg_table *sgt, int size)

{

	unsigned size = npages << PAGE_SHIFT;

	int ret = 0;



	if (GEM_WARN_ON(!vma->iova))
@@ -120,7 +119,7 @@ void msm_gem_close_vma(struct msm_gem_address_space *aspace, 


/* Initialize a new vma and allocate an iova for it */

int msm_gem_init_vma(struct msm_gem_address_space *aspace,

		struct msm_gem_vma *vma, int npages,

		struct msm_gem_vma *vma, int size,

		u64 range_start, u64 range_end)

{

	int ret;
@@ -129,14 +128,15 @@ int msm_gem_init_vma(struct msm_gem_address_space *aspace, 
		return -EBUSY;



	spin_lock(&aspace->lock);

	ret = drm_mm_insert_node_in_range(&aspace->mm, &vma->node, npages, 0,

		0, range_start, range_end, 0);

	ret = drm_mm_insert_node_in_range(&aspace->mm, &vma->node,

					  size, PAGE_SIZE, 0,

					  range_start, range_end, 0);

	spin_unlock(&aspace->lock);



	if (ret)

		return ret;



	vma->iova = vma->node.start << PAGE_SHIFT;

	vma->iova = vma->node.start;

	vma->mapped = false;



	kref_get(&aspace->kref);
@@ -161,7 +161,7 @@ msm_gem_address_space_create(struct msm_mmu *mmu, const char *name, 
	aspace->name = name;

	aspace->mmu = mmu;



	drm_mm_init(&aspace->mm, va_start >> PAGE_SHIFT, size >> PAGE_SHIFT);

	drm_mm_init(&aspace->mm, va_start, size);



	kref_init(&aspace->kref);