Commit 7e34b8f6 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm: Rename msm_gem_vma_purge() -> _unmap() 



This is a more descriptive name.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Signed-off-by: default avatarRob Clark <robin.clark@oss.qualcomm.com>
Tested-by: default avatarAntonino Maniscalco <antomani103@gmail.com>
Reviewed-by: default avatarAntonino Maniscalco <antomani103@gmail.com>
Patchwork: https://patchwork.freedesktop.org/patch/661487/
parent dbbde63c

drivers/gpu/drm/msm/msm_gem.c

+3 −3
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static void detach_vm(struct drm_gem_object *obj, struct drm_gpuvm *vm) 
		drm_gpuvm_bo_for_each_va (vma, vm_bo) {

			if (vma->vm != vm)

				continue;

			msm_gem_vma_purge(vma);

			msm_gem_vma_unmap(vma);

			msm_gem_vma_close(vma);

			break;

		}
@@ -433,7 +433,7 @@ put_iova_spaces(struct drm_gem_object *obj, struct drm_gpuvm *vm, bool close) 
		drm_gpuvm_bo_get(vm_bo);



		drm_gpuvm_bo_for_each_va_safe (vma, vmatmp, vm_bo) {

			msm_gem_vma_purge(vma);

			msm_gem_vma_unmap(vma);

			if (close)

				msm_gem_vma_close(vma);

		}
@@ -607,7 +607,7 @@ static int clear_iova(struct drm_gem_object *obj, 
	if (!vma)

		return 0;



	msm_gem_vma_purge(vma);

	msm_gem_vma_unmap(vma);

	msm_gem_vma_close(vma);



	return 0;

drivers/gpu/drm/msm/msm_gem.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ struct msm_gem_vma { 
struct drm_gpuva *

msm_gem_vma_new(struct drm_gpuvm *vm, struct drm_gem_object *obj,

		u64 offset, u64 range_start, u64 range_end);

void msm_gem_vma_purge(struct drm_gpuva *vma);

void msm_gem_vma_unmap(struct drm_gpuva *vma);

int msm_gem_vma_map(struct drm_gpuva *vma, int prot, struct sg_table *sgt);

void msm_gem_vma_close(struct drm_gpuva *vma);

drivers/gpu/drm/msm/msm_gem_vma.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ msm_gem_vm_free(struct drm_gpuvm *gpuvm) 
}



/* Actually unmap memory for the vma */

void msm_gem_vma_purge(struct drm_gpuva *vma)

void msm_gem_vma_unmap(struct drm_gpuva *vma)

{

	struct msm_gem_vma *msm_vma = to_msm_vma(vma);

	struct msm_gem_vm *vm = to_msm_vm(vma->vm);