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

Commit 8542912f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: move frame_done_timeout after phys encoder disable"

parents 0b5a5af4 ac70425c

drivers/gpu/drm/msm/sde/sde_crtc.c

+2 −1
Original line number Diff line number Diff line
@@ -2775,7 +2775,8 @@ static int sde_crtc_atomic_check(struct drm_crtc *crtc, 


		/* check dim layer stage with every plane */

		for (i = 0; i < cstate->num_dim_layers; i++) {

			if (pstates[cnt].stage == cstate->dim_layer[i].stage) {

			if (cstate->dim_layer[i].stage

					== (pstates[cnt].stage + SDE_STAGE_0)) {

				SDE_ERROR(

					"plane:%d/dim_layer:%i-same stage:%d\n",

					plane->base.id, i,

drivers/gpu/drm/msm/sde/sde_encoder.c

+3 −3
Original line number Diff line number Diff line
@@ -1709,15 +1709,15 @@ static void sde_encoder_virt_disable(struct drm_encoder *drm_enc) 
		}

	}



	if (sde_enc->cur_master && sde_enc->cur_master->ops.disable)

		sde_enc->cur_master->ops.disable(sde_enc->cur_master);



	/* after phys waits for frame-done, should be no more frames pending */

	if (atomic_xchg(&sde_enc->frame_done_timeout, 0)) {

		SDE_ERROR("enc%d timeout pending\n", drm_enc->base.id);

		del_timer_sync(&sde_enc->frame_done_timer);

	}



	if (sde_enc->cur_master && sde_enc->cur_master->ops.disable)

		sde_enc->cur_master->ops.disable(sde_enc->cur_master);



	sde_encoder_resource_control(drm_enc, SDE_ENC_RC_EVENT_STOP);



	if (sde_enc->cur_master) {