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

Commit 46f1d42f authored by Liviu Dudau's avatar Liviu Dudau
Browse files

drm: mali-dp: Update the state of all planes before re-enabling active CRTCs. 



Mali DP needs to have all the planes that are becoming inactive in the
new state disabled before re-enabling the active CRTC, otherwise we
start streaming out data from old pointers in memory.

Signed-off-by: default avatarLiviu Dudau <Liviu.Dudau@arm.com>
parent 6b146270

drivers/gpu/drm/arm/malidp_drv.c

+8 −4
Original line number Diff line number Diff line
@@ -66,10 +66,12 @@ static void malidp_atomic_commit_hw_done(struct drm_atomic_state *state) 
	struct drm_pending_vblank_event *event;

	struct drm_device *drm = state->dev;

	struct malidp_drm *malidp = drm->dev_private;

	int ret = malidp_set_and_wait_config_valid(drm);



	if (ret)

	if (malidp->crtc.enabled) {

		/* only set config_valid if the CRTC is enabled */

		if (malidp_set_and_wait_config_valid(drm))

			DRM_DEBUG_DRIVER("timed out waiting for updated configuration\n");

	}



	event = malidp->crtc.state->event;

	if (event) {
@@ -90,9 +92,11 @@ static void malidp_atomic_commit_tail(struct drm_atomic_state *state) 
	struct drm_device *drm = state->dev;



	drm_atomic_helper_commit_modeset_disables(drm, state);

	drm_atomic_helper_commit_modeset_enables(drm, state);



	drm_atomic_helper_commit_planes(drm, state, 0);



	drm_atomic_helper_commit_modeset_enables(drm, state);



	malidp_atomic_commit_hw_done(state);



	drm_atomic_helper_wait_for_vblanks(drm, state);