diff options
| author | Rob Clark <robdclark@chromium.org> | 2019-08-29 19:45:13 +0300 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2019-09-04 02:17:01 +0300 |
| commit | 80b4b4a703d6e4fb966e5c6a7c74a06001bf7d19 (patch) | |
| tree | 1737ddeba49e6680c1406ef1dbbe202076e3050d /drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | |
| parent | d4d2c60497cfc5063f129010521ba69f34f33127 (diff) | |
| download | linux-80b4b4a703d6e4fb966e5c6a7c74a06001bf7d19.tar.xz | |
drm/msm: convert kms->complete_commit() to crtc_mask
Prep work for async commits, in which case this will be called after we
no longer have the atomic state object.
This drops some wait_for_vblanks(), but those should be unnecessary, as
we call this after waiting for flush to complete.
Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Sean Paul <sean@poorly.run>
Diffstat (limited to 'drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c')
| -rw-r--r-- | drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c index 83e49fdf0816..8c6622fb373b 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c @@ -119,17 +119,13 @@ static void mdp4_wait_flush(struct msm_kms *kms, unsigned crtc_mask) mdp4_crtc_wait_for_commit_done(crtc); } -static void mdp4_complete_commit(struct msm_kms *kms, struct drm_atomic_state *state) +static void mdp4_complete_commit(struct msm_kms *kms, unsigned crtc_mask) { struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms)); - int i; 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) + for_each_crtc_mask(mdp4_kms->dev, crtc, crtc_mask) drm_crtc_vblank_put(crtc); mdp4_disable(mdp4_kms); |