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

Commit 862cc8b4 authored by Mario Kleiner's avatar Mario Kleiner Committed by Dave Airlie
Browse files

drm: Remove preempt_disable() from vblank timestamping code. 



Preemption handling will get pushed into the kms
drivers in followup patches, to make timestamping
more robust and PREEMPT_RT friendly.

Signed-off-by: default avatarMario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent bbf1f8bf

drivers/gpu/drm/drm_irq.c

+0 −7
Original line number Diff line number Diff line
@@ -586,11 +586,6 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc, 
	 * code gets preempted or delayed for some reason.

	 */

	for (i = 0; i < DRM_TIMESTAMP_MAXRETRIES; i++) {

		/* Disable preemption to make it very likely to

		 * succeed in the first iteration even on PREEMPT_RT kernel.

		 */

		preempt_disable();



		/* Get system timestamp before query. */

		stime = ktime_get();
@@ -602,8 +597,6 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc, 
		if (!drm_timestamp_monotonic)

			mono_time_offset = ktime_get_monotonic_offset();



		preempt_enable();



		/* Return as no-op if scanout query unsupported or failed. */

		if (!(vbl_status & DRM_SCANOUTPOS_VALID)) {

			DRM_DEBUG("crtc %d : scanoutpos query failed [%d].\n",