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

Commit 347b90b4 authored by Sean Paul's avatar Sean Paul Committed by Rob Clark
Browse files

drm/msm: Refactor complete_commit() to look more the helpers 



Factor out the commit_tail() portions of complete_commit() into a
separate function to facilitate moving to the atomic helpers in future
patches.

Changes in v2:
- None
Changes in v3:
- Rebased on Archit's private_obj set
Changes in v4:
- None

Cc: Jeykumar Sankaran <jsanka@codeaurora.org>
Reviewed-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent c21c731d

drivers/gpu/drm/msm/msm_atomic.c

+16 −9
Original line number Diff line number Diff line
@@ -97,18 +97,12 @@ static void msm_atomic_wait_for_commit_done(struct drm_device *dev, 
	}

}



/* The (potentially) asynchronous part of the commit.  At this point

 * nothing can fail short of armageddon.

 */

static void complete_commit(struct msm_commit *c, bool async)

static void msm_atomic_commit_tail(struct drm_atomic_state *state)

{

	struct drm_atomic_state *state = c->state;

	struct drm_device *dev = state->dev;

	struct msm_drm_private *priv = dev->dev_private;

	struct msm_kms *kms = priv->kms;



	drm_atomic_helper_wait_for_fences(dev, state, false);



	kms->funcs->prepare_commit(kms, state);



	drm_atomic_helper_commit_modeset_disables(dev, state);
@@ -135,6 +129,19 @@ static void complete_commit(struct msm_commit *c, bool async) 
	drm_atomic_helper_cleanup_planes(dev, state);



	kms->funcs->complete_commit(kms, state);

}



/* The (potentially) asynchronous part of the commit.  At this point

 * nothing can fail short of armageddon.

 */

static void complete_commit(struct msm_commit *c)

{

	struct drm_atomic_state *state = c->state;

	struct drm_device *dev = state->dev;



	drm_atomic_helper_wait_for_fences(dev, state, false);



	msm_atomic_commit_tail(state);



	drm_atomic_state_put(state);
@@ -143,7 +150,7 @@ static void complete_commit(struct msm_commit *c, bool async) 


static void commit_worker(struct work_struct *work)

{

	complete_commit(container_of(work, struct msm_commit, work), true);

	complete_commit(container_of(work, struct msm_commit, work));

}



/**
@@ -248,7 +255,7 @@ int msm_atomic_commit(struct drm_device *dev, 
		return 0;

	}



	complete_commit(c, false);

	complete_commit(c);



	return 0;