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

Commit 136e9310 authored by Samantha Tran's avatar Samantha Tran
Browse files

Revert "drm/msm: Move wait vblanks to mdp complete_commit hook" 



This reverts commit a5c6b599.

This reversion is happening as a result of disabling the
disp/dpu directory as it will not be used in 4.19 downstream
display driver and these changes are made in a common layer
which affects the downstream driver functionalities. Separate
patches are submitted to revert the upstream driver and
introduce the downstream version of the display driver.

Change-Id: Iddf8656b38631ceb20fec34e0fb6cc753db81ed2
Signed-off-by: default avatarSamantha Tran <samtran@codeaurora.org>
parent bd6b0bbc

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

+0 −2
Original line number Diff line number Diff line
@@ -125,8 +125,6 @@ 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);

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

+1 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014, 2018, The Linux Foundation. All rights reserved.

 * Copyright (C) 2013 Red Hat

 * Author: Rob Clark <robdclark@gmail.com>

 *
@@ -170,8 +170,6 @@ 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)

drivers/gpu/drm/msm/msm_atomic.c

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ 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);