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

Commit dc9a9b32 authored by Steve Kowalik's avatar Steve Kowalik Committed by Rob Clark
Browse files

drm/msm: Replace gem_object deprecated functions 



drm_gem_object_{reference,unreference,unreference_unlocked} are
deprecated functions, and merely alias to the get/put functions.
Switch to the new names.

Signed-off-by: default avatarSteve Kowalik <steven@wedontsleep.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent cccb9723

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

+3 −3
Original line number Diff line number Diff line
@@ -858,19 +858,19 @@ static void a5xx_destroy(struct msm_gpu *gpu) 
	if (a5xx_gpu->pm4_bo) {

		if (a5xx_gpu->pm4_iova)

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

		drm_gem_object_unreference_unlocked(a5xx_gpu->pm4_bo);

		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);

		drm_gem_object_unreference_unlocked(a5xx_gpu->pfp_bo);

		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);

		drm_gem_object_unreference_unlocked(a5xx_gpu->gpmu_bo);

		drm_gem_object_put_unlocked(a5xx_gpu->gpmu_bo);

	}



	adreno_gpu_cleanup(adreno_gpu);

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

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



	msm_gem_put_iova(val, kms->aspace);

	drm_gem_object_unreference_unlocked(val);

	drm_gem_object_put_unlocked(val);

}



static void mdp4_crtc_destroy(struct drm_crtc *crtc)
@@ -382,7 +382,7 @@ static void update_cursor(struct drm_crtc *crtc) 


		if (next_bo) {

			/* take a obj ref + iova ref when we start scanning out: */

			drm_gem_object_reference(next_bo);

			drm_gem_object_get(next_bo);

			msm_gem_get_iova(next_bo, kms->aspace, &iova);



			/* enable cursor: */
@@ -467,7 +467,7 @@ static int mdp4_crtc_cursor_set(struct drm_crtc *crtc, 
	return 0;



fail:

	drm_gem_object_unreference_unlocked(cursor_bo);

	drm_gem_object_put_unlocked(cursor_bo);

	return ret;

}

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

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


	if (mdp4_kms->blank_cursor_iova)

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

	drm_gem_object_unreference_unlocked(mdp4_kms->blank_cursor_bo);

	drm_gem_object_put_unlocked(mdp4_kms->blank_cursor_bo);



	if (aspace) {

		aspace->mmu->funcs->detach(aspace->mmu,

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

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



	msm_gem_put_iova(val, kms->aspace);

	drm_gem_object_unreference_unlocked(val);

	drm_gem_object_put_unlocked(val);

}



static void mdp5_crtc_destroy(struct drm_crtc *crtc)

drivers/gpu/drm/msm/msm_drv.c

+4 −4
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ static int msm_ioctl_gem_cpu_prep(struct drm_device *dev, void *data, 


	ret = msm_gem_cpu_prep(obj, args->op, &timeout);



	drm_gem_object_unreference_unlocked(obj);

	drm_gem_object_put_unlocked(obj);



	return ret;

}
@@ -678,7 +678,7 @@ static int msm_ioctl_gem_cpu_fini(struct drm_device *dev, void *data, 


	ret = msm_gem_cpu_fini(obj);



	drm_gem_object_unreference_unlocked(obj);

	drm_gem_object_put_unlocked(obj);



	return ret;

}
@@ -718,7 +718,7 @@ static int msm_ioctl_gem_info(struct drm_device *dev, void *data, 
		args->offset = msm_gem_mmap_offset(obj);

	}



	drm_gem_object_unreference_unlocked(obj);

	drm_gem_object_put_unlocked(obj);



	return ret;

}
@@ -783,7 +783,7 @@ static int msm_ioctl_gem_madvise(struct drm_device *dev, void *data, 
		ret = 0;

	}



	drm_gem_object_unreference(obj);

	drm_gem_object_put(obj);



unlock:

	mutex_unlock(&dev->struct_mutex);