drm: Only handle _DRM_VBLANK_NEXTONMISS once (97ef1ae0) · Commits · 戴 / test

Consolidate the _DRM_VBLANK_NEXTONMISS handling between drm_wait_vblank and drm_queue_vblank_event. This is a cleanup spotted while working on other changes. (The way it was previously handled could also theoretically result in drm_queue_vblank_event unnecessarily bumping vblwait->request.sequence, if the vblank counter happened to increment between the drm_vblank_count(_and_time) calls in each function, but that's unlikely) Signed-off-by:

Michel Dänzer <michel.daenzer@amd.com> Reviewed-by:

Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by:

Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1466755187-29418-1-git-send-email-michel@daenzer.net

drivers/gpu/drm/drm_irq.c

+5 −11

Original line number	Diff line number	Diff line
		@@ -1588,12 +1588,6 @@ static int drm_queue_vblank_event(struct drm_device *dev, unsigned int pipe,

		seq = drm_vblank_count_and_time(dev, pipe, &now);

		if ((vblwait->request.type & _DRM_VBLANK_NEXTONMISS) &&
		(seq - vblwait->request.sequence) <= (1 << 23)) {
		vblwait->request.sequence = seq + 1;
		vblwait->reply.sequence = vblwait->request.sequence;
		}

		DRM_DEBUG("event on vblank count %d, current %d, crtc %u\n",
		vblwait->request.sequence, seq, pipe);

		@@ -1690,6 +1684,11 @@ int drm_wait_vblank(struct drm_device dev, void data,
		goto done;
		}

		if ((flags & _DRM_VBLANK_NEXTONMISS) &&
		(seq - vblwait->request.sequence) <= (1 << 23)) {
		vblwait->request.sequence = seq + 1;
		}

		if (flags & _DRM_VBLANK_EVENT) {
		/* must hold on to the vblank ref until the event fires
		* drm_vblank_put will be called asynchronously
		@@ -1697,11 +1696,6 @@ int drm_wait_vblank(struct drm_device dev, void data,
		return drm_queue_vblank_event(dev, pipe, vblwait, file_priv);
		}

		if ((flags & _DRM_VBLANK_NEXTONMISS) &&
		(seq - vblwait->request.sequence) <= (1<<23)) {
		vblwait->request.sequence = seq + 1;
		}

		DRM_DEBUG("waiting on vblank count %d, crtc %u\n",
		vblwait->request.sequence, pipe);
		vblank->last_wait = vblwait->request.sequence;

Admin message