drm/nouveau/kms/nv50: update vblank state in response to modeset actions

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

1 files changed, 12 insertions, 6 deletions

diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 06b9670005bb..2bc0dc985214 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -3940,6 +3940,8 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
 
                 NV_ATOMIC(drm, "%s: clr %04x (set %04x)\n", crtc->name,
                           asyh->clr.mask, asyh->set.mask);
+                if (crtc_state->active && !asyh->state.active)
+                        drm_crtc_vblank_off(crtc);
 
                 if (asyh->clr.mask) {
                         nv50_head_flush_clr(head, asyh, atom->flush_disable);
@@ -4025,11 +4027,13 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
                         nv50_head_flush_set(head, asyh);
                         interlock_core = 1;
                 }
-        }
 
-        for_each_crtc_in_state(state, crtc, crtc_state, i) {
-                if (crtc->state->event)
-                        drm_crtc_vblank_get(crtc);
+                if (asyh->state.active) {
+                        if (!crtc_state->active)
+                                drm_crtc_vblank_on(crtc);
+                        if (asyh->state.event)
+                                drm_crtc_vblank_get(crtc);
+                }
         }
 
         /* Update plane(s). */
@@ -4076,12 +4080,14 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
                 if (crtc->state->event) {
                         unsigned long flags;
                         /* Get correct count/ts if racing with vblank irq */
-                        drm_accurate_vblank_count(crtc);
+                        if (crtc->state->active)
+                                drm_accurate_vblank_count(crtc);
                         spin_lock_irqsave(&crtc->dev->event_lock, flags);
                         drm_crtc_send_vblank_event(crtc, crtc->state->event);
                         spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
                         crtc->state->event = NULL;
-                        drm_crtc_vblank_put(crtc);
+                        if (crtc->state->active)
+                                drm_crtc_vblank_put(crtc);
                 }
         }