openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Sean Paul 2018-02-28 14:18:58 -05:00 committed by Rob Clark
parent c21c731d93
commit 347b90b406
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/gpu/drm/msm/msm_atomic.c
View File

@ -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 static void msm_atomic_commit_tail(struct drm_atomic_state *state)
* nothing can fail short of armageddon.
*/
static void complete_commit(struct msm_commit *c, bool async)
{ {
struct drm_atomic_state *state = c->state;
struct drm_device *dev = state->dev; struct drm_device *dev = state->dev;
struct msm_drm_private *priv = dev->dev_private; struct msm_drm_private *priv = dev->dev_private;
struct msm_kms *kms = priv->kms; struct msm_kms *kms = priv->kms;
drm_atomic_helper_wait_for_fences(dev, state, false);
kms->funcs->prepare_commit(kms, state); kms->funcs->prepare_commit(kms, state);
drm_atomic_helper_commit_modeset_disables(dev, 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); drm_atomic_helper_cleanup_planes(dev, state);
kms->funcs->complete_commit(kms, 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); 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) 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; return 0;
} }
complete_commit(c, false); complete_commit(c);
return 0; return 0;