summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
diff options
context:
space:
mode:
authorRob Clark <robdclark@chromium.org>2019-08-29 09:45:13 -0700
committerRob Clark <robdclark@chromium.org>2019-09-03 16:17:01 -0700
commit80b4b4a703d6e4fb966e5c6a7c74a06001bf7d19 (patch)
tree1737ddeba49e6680c1406ef1dbbe202076e3050d /drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
parentd4d2c60497cfc5063f129010521ba69f34f33127 (diff)
downloadlinux-stable-80b4b4a703d6e4fb966e5c6a7c74a06001bf7d19.tar.gz
linux-stable-80b4b4a703d6e4fb966e5c6a7c74a06001bf7d19.tar.bz2
linux-stable-80b4b4a703d6e4fb966e5c6a7c74a06001bf7d19.zip
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/mdp5/mdp5_kms.c')
-rw-r--r--drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
index eec220f22445..7be28f14f93b 100644
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
@@ -169,14 +169,12 @@ static void mdp5_wait_flush(struct msm_kms *kms, unsigned crtc_mask)
mdp5_crtc_wait_for_commit_done(crtc);
}
-static void mdp5_complete_commit(struct msm_kms *kms, struct drm_atomic_state *state)
+static void mdp5_complete_commit(struct msm_kms *kms, unsigned crtc_mask)
{
struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(kms));
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)