Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5c6b599 authored by Sean Paul's avatar Sean Paul
Browse files

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: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarRajesh Yadav <ryadav@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 425a2d24

drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -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 *crtc;

	struct drm_crtc_state *crtc_state;

	struct drm_crtc_state *crtc_state;





	drm_atomic_helper_wait_for_vblanks(mdp4_kms->dev, state);



	/* see 119ecb7fd */

	/* see 119ecb7fd */

	for_each_new_crtc_in_state(state, crtc, crtc_state, i)

	for_each_new_crtc_in_state(state, crtc, crtc_state, i)

		drm_crtc_vblank_put(crtc);

		drm_crtc_vblank_put(crtc);

drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -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 device *dev = &mdp5_kms->pdev->dev;

	struct mdp5_global_state *global_state;

	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);

	global_state = mdp5_get_existing_global_state(mdp5_kms);





	if (mdp5_kms->smp)

	if (mdp5_kms->smp)

drivers/gpu/drm/msm/msm_atomic.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -75,8 +75,6 @@ void msm_atomic_commit_tail(struct drm_atomic_state *state) 




	kms->funcs->complete_commit(kms, 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_commit_hw_done(state);





	drm_atomic_helper_cleanup_planes(dev, state);

	drm_atomic_helper_cleanup_planes(dev, state);