Commit 06a7d357 authored Jun 25, 2019 by Robert Beckett Committed by Greg Kroah-Hartman Jul 10, 2019

drm/imx: notify drm core before sending event during crtc disable



commit 78c68e8f5cd24bd32ba4ca1cdfb0c30cf0642685 upstream.

Notify drm core before sending pending events during crtc disable.
This fixes the first event after disable having an old stale timestamp
by having drm_crtc_vblank_off update the timestamp to now.

This was seen while debugging weston log message:
Warning: computed repaint delay is insane: -8212 msec

This occurred due to:
1. driver starts up
2. fbcon comes along and restores fbdev, enabling vblank
3. vblank_disable_fn fires via timer disabling vblank, keeping vblank
seq number and time set at current value
(some time later)
4. weston starts and does a modeset
5. atomic commit disables crtc while it does the modeset
6. ipu_crtc_atomic_disable sends vblank with old seq number and time

Fixes: a4744786 ("drm/imx: fix crtc vblank state regression")

Signed-off-by: Robert Beckett <bob.beckett@collabora.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent ea683943

drivers/gpu/drm/imx/ipuv3-crtc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -76,14 +76,14 @@ static void ipu_crtc_atomic_disable(struct drm_crtc *crtc,
		drm_atomic_helper_disable_planes_on_crtc(old_crtc_state, false);
		ipu_dc_disable(ipu);

		drm_crtc_vblank_off(crtc);

		spin_lock_irq(&crtc->dev->event_lock);
		if (crtc->state->event) {
		drm_crtc_send_vblank_event(crtc, crtc->state->event);
		crtc->state->event = NULL;
		}
		spin_unlock_irq(&crtc->dev->event_lock);

		drm_crtc_vblank_off(crtc);
		}

		static void imx_drm_crtc_reset(struct drm_crtc *crtc)