drm/msm: Move wait_for_vblanks into mdp complete_commit() hooks

DPU doesn't use this, so push it into the mdp drivers.

Changes in v3:
- None

Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Rajesh Yadav <ryadav@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
index 4b646bf..44d1cda 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
@@ -125,6 +125,8 @@ static void mdp4_complete_commit(struct msm_kms *kms, struct drm_atomic_state *s
        struct drm_crtc *crtc;
        struct drm_crtc_state *crtc_state;
 
+       drm_atomic_helper_wait_for_vblanks(mdp4_kms->dev, state);
+
        /* see 119ecb7fd */
        for_each_new_crtc_in_state(state, crtc, crtc_state, i)
                drm_crtc_vblank_put(crtc);

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
index 6e12e27..bddd625 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
@@ -170,6 +170,8 @@ static void mdp5_complete_commit(struct msm_kms *kms, struct drm_atomic_state *s
        struct device *dev = &mdp5_kms->pdev->dev;
        struct mdp5_global_state *global_state;
 
+       drm_atomic_helper_wait_for_vblanks(mdp5_kms->dev, state);
+
        global_state = mdp5_get_existing_global_state(mdp5_kms);
 
        if (mdp5_kms->smp)

diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c
index f0635c3..e6f1e25 100644 (file)
--- a/drivers/gpu/drm/msm/msm_atomic.c
+++ b/drivers/gpu/drm/msm/msm_atomic.c
@@ -75,8 +75,6 @@ void msm_atomic_commit_tail(struct drm_atomic_state *state)
 
        kms->funcs->complete_commit(kms, state);
 
-       drm_atomic_helper_wait_for_vblanks(dev, state);
-
        drm_atomic_helper_commit_hw_done(state);
 
        drm_atomic_helper_cleanup_planes(dev, state);