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

Commit 9d1eee08 authored by Veera Sundaram Sankaran's avatar Veera Sundaram Sankaran
Browse files

disp: msm: sde: fix vblank handling during trusted UI 



Currently vblank enable/disable events are processed based
on the vm ownership check. Use the vblank helper functions
instead, during the transitions to avoid processing the
vblank from DRM framework level.

Change-Id: Icb2bd569e73d9206a234489a288320fecf631845
Signed-off-by: default avatarVeera Sundaram Sankaran <veeras@codeaurora.org>
parent 689f5eb8

msm/sde/sde_kms.c

+9 −39
Original line number Diff line number Diff line
@@ -205,64 +205,28 @@ static int _sde_kms_dump_clks_state(struct sde_kms *sde_kms) 
}

#endif



static bool _sde_kms_skip_vblank_op(struct sde_kms *sde_kms)

{

	struct sde_vm_ops *vm_ops = sde_vm_get_ops(sde_kms);



	if (vm_ops && vm_ops->vm_owns_hw

				&& !vm_ops->vm_owns_hw(sde_kms))

		return true;



	return false;

}



static int sde_kms_enable_vblank(struct msm_kms *kms, struct drm_crtc *crtc)

{

	int ret = 0;

	struct sde_kms *sde_kms;

	int ret;



	if (!kms)

	if (!kms || !crtc)

		return -EINVAL;



	sde_kms = to_sde_kms(kms);



	sde_vm_lock(sde_kms);



	if (_sde_kms_skip_vblank_op(sde_kms)) {

		SDE_DEBUG("skipping vblank enable due to HW unavailablity\n");

		goto done;

	}



	SDE_ATRACE_BEGIN("sde_kms_enable_vblank");

	ret = sde_crtc_vblank(crtc, true);

	SDE_ATRACE_END("sde_kms_enable_vblank");

done:

	sde_vm_unlock(sde_kms);



	return ret;

}



static void sde_kms_disable_vblank(struct msm_kms *kms, struct drm_crtc *crtc)

{

	struct sde_kms *sde_kms;



	if (!kms)

	if (!kms || !crtc)

		return;



	sde_kms = to_sde_kms(kms);



	sde_vm_lock(sde_kms);



	if (_sde_kms_skip_vblank_op(sde_kms)) {

		SDE_DEBUG("skipping vblank disable due to HW unavailablity\n");

		goto done;

	}



	SDE_ATRACE_BEGIN("sde_kms_disable_vblank");

	sde_crtc_vblank(crtc, false);

	SDE_ATRACE_END("sde_kms_disable_vblank");

done:

	sde_vm_unlock(sde_kms);

}



static void sde_kms_wait_for_frame_transfer_complete(struct msm_kms *kms,
@@ -1071,6 +1035,9 @@ int sde_kms_vm_primary_prepare_commit(struct sde_kms *sde_kms, 
		if (drm_connector_mask(connector) & crtc->state->connector_mask)

			sde_connector_schedule_status_work(connector, true);



	/* enable vblank events */

	drm_crtc_vblank_on(crtc);



	/* handle non-SDE pre_acquire */

	if (vm_ops->vm_client_post_acquire)

		rc = vm_ops->vm_client_post_acquire(sde_kms);
@@ -1398,6 +1365,9 @@ int sde_kms_vm_pre_release(struct sde_kms *sde_kms, 
	/* disable IRQ line */

	sde_irq_update(&sde_kms->base, false);



	/* disable vblank events */

	drm_crtc_vblank_off(crtc);



	return rc;

}