aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm/msm_atomic.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2015-02-22 06:24:19 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-02-23 19:57:46 -0500
commit1af434a92871af93d97ce28e35497532a4167a0c (patch)
tree86253693a02e39bf5204a5dde82cb5866a428063 /drivers/gpu/drm/msm/msm_atomic.c
parenta072f809b69885c77262fb978b008ef9488d513e (diff)
drm/atomic-helper: Rename commmit_post/pre_planes
These names only make sense because of backwards compatability with the order used by the crtc helper library. There's not really any real requirement in the ordering here. So rename them to something more descriptive and update the kerneldoc a bit. Motivated in a discussion with Laurent about how to restore plane state for dpms for drivers with runtime pm. v2: Squash in fixup from Stephen Rothwell to fix a conflict with tegra. Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Reviewed-by: Rob Clark <robdclark@gmail.com> Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_atomic.c')
-rw-r--r--drivers/gpu/drm/msm/msm_atomic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c
index 871aa2108dc6..7c412292a0ff 100644
--- a/drivers/gpu/drm/msm/msm_atomic.c
+++ b/drivers/gpu/drm/msm/msm_atomic.c
@@ -96,11 +96,11 @@ static void complete_commit(struct msm_commit *c)
96 96
97 kms->funcs->prepare_commit(kms, state); 97 kms->funcs->prepare_commit(kms, state);
98 98
99 drm_atomic_helper_commit_pre_planes(dev, state); 99 drm_atomic_helper_commit_modeset_disables(dev, state);
100 100
101 drm_atomic_helper_commit_planes(dev, state); 101 drm_atomic_helper_commit_planes(dev, state);
102 102
103 drm_atomic_helper_commit_post_planes(dev, state); 103 drm_atomic_helper_commit_modeset_enables(dev, state);
104 104
105 /* NOTE: _wait_for_vblanks() only waits for vblank on 105 /* NOTE: _wait_for_vblanks() only waits for vblank on
106 * enabled CRTCs. So we end up faulting when disabling 106 * enabled CRTCs. So we end up faulting when disabling