Commit 3a48a403 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/gem: Cleanup submit_cleanup_bo() 



Now that it only handles unlock duty, drop the superfluous arg and
rename it.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/568333/
parent 2d7d2c4e

drivers/gpu/drm/msm/msm_gem_submit.c

+5 −10
Original line number Diff line number Diff line
@@ -248,14 +248,10 @@ static int submit_lookup_cmds(struct msm_gem_submit *submit, 
	return ret;

}



/* Unwind bo state, according to cleanup_flags.  In the success case, only

 * the lock is dropped at the end of the submit (and active/pin ref is dropped

 * later when the submit is retired).

 */

static void submit_cleanup_bo(struct msm_gem_submit *submit, int i,

		unsigned cleanup_flags)

static void submit_unlock_bo(struct msm_gem_submit *submit, int i)

{

	struct drm_gem_object *obj = submit->bos[i].obj;

	unsigned cleanup_flags = BO_LOCKED;

	unsigned flags = submit->bos[i].flags & cleanup_flags;



	/*
@@ -304,10 +300,10 @@ static int submit_lock_objects(struct msm_gem_submit *submit) 
	}



	for (; i >= 0; i--)

		submit_cleanup_bo(submit, i, BO_LOCKED);

		submit_unlock_bo(submit, i);



	if (slow_locked > 0)

		submit_cleanup_bo(submit, slow_locked, BO_LOCKED);

		submit_unlock_bo(submit, slow_locked);



	if (ret == -EDEADLK) {

		struct drm_gem_object *obj = submit->bos[contended].obj;
@@ -533,7 +529,6 @@ static int submit_reloc(struct msm_gem_submit *submit, struct drm_gem_object *ob 
 */

static void submit_cleanup(struct msm_gem_submit *submit, bool error)

{

	unsigned cleanup_flags = BO_LOCKED;

	unsigned i;



	if (error)
@@ -541,7 +536,7 @@ static void submit_cleanup(struct msm_gem_submit *submit, bool error) 


	for (i = 0; i < submit->nr_bos; i++) {

		struct drm_gem_object *obj = submit->bos[i].obj;

		submit_cleanup_bo(submit, i, cleanup_flags);

		submit_unlock_bo(submit, i);

		if (error)

			drm_gem_object_put(obj);

	}