Commit f7d33950 authored by Emil Velikov's avatar Emil Velikov Committed by Emil Velikov
Browse files

drm/msm: remove _unlocked suffix in drm_gem_object_put_unlocked 



Spelling out _unlocked for each and every driver is a annoying.
Especially if we consider how many drivers, do not know (or need to)
about the horror stories involving struct_mutex.

Just drop the suffix. It makes the API cleaner.

Done via the following script:

__from=drm_gem_object_put_unlocked
__to=drm_gem_object_put
for __file in $(git grep --name-only $__from); do
  sed -i  "s/$__from/$__to/g" $__file;
done

Cc: Rob Clark <robdclark@gmail.com>
Cc: Sean Paul <sean@poorly.run>
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-25-emil.l.velikov@gmail.com
parent c457b11a

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

+3 −3
Original line number Diff line number Diff line
@@ -804,17 +804,17 @@ static void a5xx_destroy(struct msm_gpu *gpu) 


	if (a5xx_gpu->pm4_bo) {

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

		drm_gem_object_put_unlocked(a5xx_gpu->pm4_bo);

		drm_gem_object_put(a5xx_gpu->pm4_bo);

	}



	if (a5xx_gpu->pfp_bo) {

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

		drm_gem_object_put_unlocked(a5xx_gpu->pfp_bo);

		drm_gem_object_put(a5xx_gpu->pfp_bo);

	}



	if (a5xx_gpu->gpmu_bo) {

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

		drm_gem_object_put_unlocked(a5xx_gpu->gpmu_bo);

		drm_gem_object_put(a5xx_gpu->gpmu_bo);

	}



	adreno_gpu_cleanup(adreno_gpu);

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

+1 −1
Original line number Diff line number Diff line
@@ -795,7 +795,7 @@ static void a6xx_destroy(struct msm_gpu *gpu) 


	if (a6xx_gpu->sqe_bo) {

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

		drm_gem_object_put_unlocked(a6xx_gpu->sqe_bo);

		drm_gem_object_put(a6xx_gpu->sqe_bo);

	}



	a6xx_gmu_remove(a6xx_gpu);

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

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val) 
	struct msm_kms *kms = &mdp4_kms->base.base;



	msm_gem_unpin_iova(val, kms->aspace);

	drm_gem_object_put_unlocked(val);

	drm_gem_object_put(val);

}



static void mdp4_crtc_destroy(struct drm_crtc *crtc)
@@ -452,7 +452,7 @@ static int mdp4_crtc_cursor_set(struct drm_crtc *crtc, 
	return 0;



fail:

	drm_gem_object_put_unlocked(cursor_bo);

	drm_gem_object_put(cursor_bo);

	return ret;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static void mdp4_destroy(struct msm_kms *kms) 


	if (mdp4_kms->blank_cursor_iova)

		msm_gem_unpin_iova(mdp4_kms->blank_cursor_bo, kms->aspace);

	drm_gem_object_put_unlocked(mdp4_kms->blank_cursor_bo);

	drm_gem_object_put(mdp4_kms->blank_cursor_bo);



	if (aspace) {

		aspace->mmu->funcs->detach(aspace->mmu);

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

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val) 
	struct msm_kms *kms = &mdp5_kms->base.base;



	msm_gem_unpin_iova(val, kms->aspace);

	drm_gem_object_put_unlocked(val);

	drm_gem_object_put(val);

}



static void mdp5_crtc_destroy(struct drm_crtc *crtc)

CRA Git | Maintained and supported by SUSTech CRA and CCSE