Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ad0e8cf authored by Jordan Crouse's avatar Jordan Crouse Committed by Rob Clark
Browse files

drm/msm: Count how many times iova memory is pinned 



Add a reference count to track how many times a particular
chunk of iova memory is pinned (mapped) in the iomu and
add msm_gem_unpin_iova to give up references.

It is important to note that msm_gem_unpin_iova replaces
msm_gem_put_iova because the new implicit behavior
that an assigned iova in a given vma is now valid for the
life of the buffer and what we are really focusing on is
the use of that iova.

For now the unmappings are lazy; once the reference counts
go to zero they *COULD* be unmapped dynamically but that
will require an outside force such as a shrinker or
mm_notifiers.  For now, we're just focusing on getting
the counting right and setting ourselves up to be ready
for the future.

Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 9fe041f6

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

+2 −4
Original line number Diff line number Diff line
@@ -130,15 +130,13 @@ reset_set(void *data, u64 val) 
	adreno_gpu->fw[ADRENO_FW_PFP] = NULL;



	if (a5xx_gpu->pm4_bo) {

		if (a5xx_gpu->pm4_iova)

			msm_gem_put_iova(a5xx_gpu->pm4_bo, gpu->aspace);

		msm_gem_unpin_iova(a5xx_gpu->pm4_bo, gpu->aspace);

		drm_gem_object_put(a5xx_gpu->pm4_bo);

		a5xx_gpu->pm4_bo = NULL;

	}



	if (a5xx_gpu->pfp_bo) {

		if (a5xx_gpu->pfp_iova)

			msm_gem_put_iova(a5xx_gpu->pfp_bo, gpu->aspace);

		msm_gem_unpin_iova(a5xx_gpu->pfp_bo, gpu->aspace);

		drm_gem_object_put(a5xx_gpu->pfp_bo);

		a5xx_gpu->pfp_bo = NULL;

	}

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

+3 −6
Original line number Diff line number Diff line
@@ -840,20 +840,17 @@ static void a5xx_destroy(struct msm_gpu *gpu) 
	a5xx_preempt_fini(gpu);



	if (a5xx_gpu->pm4_bo) {

		if (a5xx_gpu->pm4_iova)

			msm_gem_put_iova(a5xx_gpu->pm4_bo, gpu->aspace);

		msm_gem_unpin_iova(a5xx_gpu->pm4_bo, gpu->aspace);

		drm_gem_object_put_unlocked(a5xx_gpu->pm4_bo);

	}



	if (a5xx_gpu->pfp_bo) {

		if (a5xx_gpu->pfp_iova)

			msm_gem_put_iova(a5xx_gpu->pfp_bo, gpu->aspace);

		msm_gem_unpin_iova(a5xx_gpu->pfp_bo, gpu->aspace);

		drm_gem_object_put_unlocked(a5xx_gpu->pfp_bo);

	}



	if (a5xx_gpu->gpmu_bo) {

		if (a5xx_gpu->gpmu_iova)

			msm_gem_put_iova(a5xx_gpu->gpmu_bo, gpu->aspace);

		msm_gem_unpin_iova(a5xx_gpu->gpmu_bo, gpu->aspace);

		drm_gem_object_put_unlocked(a5xx_gpu->gpmu_bo);

	}

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

+1 −2
Original line number Diff line number Diff line
@@ -736,8 +736,7 @@ static void a6xx_destroy(struct msm_gpu *gpu) 
	struct a6xx_gpu *a6xx_gpu = to_a6xx_gpu(adreno_gpu);



	if (a6xx_gpu->sqe_bo) {

		if (a6xx_gpu->sqe_iova)

			msm_gem_put_iova(a6xx_gpu->sqe_bo, gpu->aspace);

		msm_gem_unpin_iova(a6xx_gpu->sqe_bo, gpu->aspace);

		drm_gem_object_put_unlocked(a6xx_gpu->sqe_bo);

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static int a6xx_crashdumper_run(struct msm_gpu *gpu, 
static void a6xx_crashdumper_free(struct msm_gpu *gpu,

		struct a6xx_crashdumper *dumper)

{

	msm_gem_put_iova(dumper->bo, gpu->aspace);

	msm_gem_unpin_iova(dumper->bo, gpu->aspace);

	msm_gem_put_vaddr(dumper->bo);



	drm_gem_object_unreference(dumper->bo);

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

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val) 
	struct mdp4_kms *mdp4_kms = get_kms(&mdp4_crtc->base);

	struct msm_kms *kms = &mdp4_kms->base.base;



	msm_gem_put_iova(val, kms->aspace);

	msm_gem_unpin_iova(val, kms->aspace);

	drm_gem_object_put_unlocked(val);

}