Merge "drm/msm/sde: fix kickoff ref count for single phys encoder usecase" (01679085) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3397,13 +3397,16 @@ static void _sde_encoder_kickoff_phys(struct sde_encoder_virt *sde_enc)
	set_bit(i, sde_enc->frame_busy_mask);		set_bit(i, sde_enc->frame_busy_mask);

	if (!phys->ops.needs_single_flush \|\|		if (!phys->ops.needs_single_flush \|\|
	!phys->ops.needs_single_flush(phys))		!phys->ops.needs_single_flush(phys)) {
			pending_kickoff_cnt =
			sde_encoder_phys_inc_pending(phys);
	_sde_encoder_trigger_flush(&sde_enc->base, phys, 0x0);		_sde_encoder_trigger_flush(&sde_enc->base, phys, 0x0);
	else if (ctl->ops.get_pending_flush) {		SDE_EVT32(pending_kickoff_cnt, SDE_EVTLOG_FUNC_CASE1);
			} else if (ctl->ops.get_pending_flush) {
	pending_kickoff_cnt =		pending_kickoff_cnt =
	sde_encoder_phys_inc_pending(phys);		sde_encoder_phys_inc_pending(phys);
	ctl->ops.get_pending_flush(ctl, &pending_flush);		ctl->ops.get_pending_flush(ctl, &pending_flush);
	SDE_EVT32(pending_kickoff_cnt);		SDE_EVT32(pending_kickoff_cnt, SDE_EVTLOG_FUNC_CASE2);
	}		}
	}		}