drm/imx: notify drm core before sending event during crtc disable
authorRobert Beckett <bob.beckett@collabora.com>
Tue, 25 Jun 2019 17:59:13 +0000 (18:59 +0100)
committerPhilipp Zabel <p.zabel@pengutronix.de>
Thu, 4 Jul 2019 10:21:25 +0000 (12:21 +0200)
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: a474478642d5 ("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>

index 9cc1d67..e04d6ef 100644 (file)
@@ -91,14 +91,14 @@ static void ipu_crtc_atomic_disable(struct drm_crtc *crtc,
+       drm_crtc_vblank_off(crtc);
        if (crtc->state->event) {
                drm_crtc_send_vblank_event(crtc, crtc->state->event);
                crtc->state->event = NULL;
-       drm_crtc_vblank_off(crtc);
 static void imx_drm_crtc_reset(struct drm_crtc *crtc)