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

Commit 42cb90f5 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "drm/msm: rework vblank event handling in dpu_crtc""

parents 3bd3374e 51c57544

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

+1 −14
Original line number Diff line number Diff line
@@ -1604,7 +1604,6 @@ static void dpu_crtc_disable(struct drm_crtc *crtc) 
	struct drm_encoder *encoder;

	struct msm_drm_private *priv;

	int ret;

	unsigned long flags;



	if (!crtc || !crtc->dev || !crtc->dev->dev_private || !crtc->state) {

		DPU_ERROR("invalid crtc\n");
@@ -1620,9 +1619,6 @@ static void dpu_crtc_disable(struct drm_crtc *crtc) 
	if (dpu_kms_is_suspend_state(crtc->dev))

		_dpu_crtc_set_suspend(crtc, true);



	/* Disable/save vblank irq handling */

	drm_crtc_vblank_off(crtc);



	mutex_lock(&dpu_crtc->crtc_lock);



	/* wait for frame_event_done completion */
@@ -1660,6 +1656,7 @@ static void dpu_crtc_disable(struct drm_crtc *crtc) 
		dpu_power_handle_unregister_event(dpu_crtc->phandle,

				dpu_crtc->power_event);





	memset(dpu_crtc->mixers, 0, sizeof(dpu_crtc->mixers));

	dpu_crtc->num_mixers = 0;

	dpu_crtc->mixers_swapped = false;
@@ -1669,13 +1666,6 @@ static void dpu_crtc_disable(struct drm_crtc *crtc) 
	cstate->bw_split_vote = false;



	mutex_unlock(&dpu_crtc->crtc_lock);



	if (crtc->state->event && !crtc->state->active) {

		spin_lock_irqsave(&crtc->dev->event_lock, flags);

		drm_crtc_send_vblank_event(crtc, crtc->state->event);

		crtc->state->event = NULL;

		spin_unlock_irqrestore(&crtc->dev->event_lock, flags);

	}

}



static void dpu_crtc_enable(struct drm_crtc *crtc,
@@ -1715,9 +1705,6 @@ static void dpu_crtc_enable(struct drm_crtc *crtc, 


	mutex_unlock(&dpu_crtc->crtc_lock);



	/* Enable/restore vblank irq handling */

	drm_crtc_vblank_on(crtc);



	dpu_crtc->power_event = dpu_power_handle_register_event(

		dpu_crtc->phandle,

		DPU_POWER_EVENT_POST_ENABLE | DPU_POWER_EVENT_POST_DISABLE |