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

Commit 0d72b739 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: avoid dead lock in missing TE recovery sequence" into msm-4.9

parents 7dc4b26d e55cd14c

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

+8 −4
Original line number Diff line number Diff line
@@ -4879,10 +4879,14 @@ int sde_encoder_display_failure_notification(struct drm_encoder *enc) 
	SDE_EVT32_VERBOSE(DRMID(enc));



	disp_thread = &priv->disp_thread[sde_enc->crtc->index];



	if (current->tgid == disp_thread->thread->tgid) {

		sde_encoder_resource_control(&sde_enc->base,

					     SDE_ENC_RC_EVENT_KICKOFF);

	} else {

		kthread_queue_work(&disp_thread->worker,

				   &sde_enc->esd_trigger_work);

		kthread_flush_work(&sde_enc->esd_trigger_work);

	}

	/**

	 * panel may stop generating te signal (vsync) during esd failure. rsc

	 * hardware may hang without vsync. Avoid rsc hang by generating the

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

+0 −4
Original line number Diff line number Diff line
@@ -242,10 +242,6 @@ int sde_encoder_update_caps_for_cont_splash(struct drm_encoder *encoder); 
 * esd timeout or other display failure notification. This event flows from

 * dsi, sde_connector to sde_encoder.

 *

 * This api must not be called from crtc_commit (display) thread because it

 * requests the flush work on same thread. It is called from esd check thread

 * based on current design.

 *

 *      TODO: manage the event at sde_kms level for forward processing.

 * @drm_enc:    Pointer to drm encoder structure

 * @Return:     true if successful in updating the encoder structure