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

Commit 17a37e3a 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: Correct vblank ref count in case of failures" into dev/msm-4.14-display

parents 0b779a34 dca6f43a

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

+8 −2
Original line number Diff line number Diff line
@@ -667,11 +667,17 @@ static int sde_encoder_phys_vid_control_vblank_irq( 
	SDE_EVT32(DRMID(phys_enc->parent), enable,

			atomic_read(&phys_enc->vblank_refcount));



	if (enable && atomic_inc_return(&phys_enc->vblank_refcount) == 1)

	if (enable && atomic_inc_return(&phys_enc->vblank_refcount) == 1) {

		ret = sde_encoder_helper_register_irq(phys_enc, INTR_IDX_VSYNC);

	else if (!enable && atomic_dec_return(&phys_enc->vblank_refcount) == 0)

		if (ret)

			atomic_dec_return(&phys_enc->vblank_refcount);

	} else if (!enable &&

			atomic_dec_return(&phys_enc->vblank_refcount) == 0) {

		ret = sde_encoder_helper_unregister_irq(phys_enc,

				INTR_IDX_VSYNC);

		if (ret)

			atomic_inc_return(&phys_enc->vblank_refcount);

	}



end:

	if (ret) {