diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 4b3735720fee..9e53240519c0 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5278,6 +5278,8 @@ static void intel_crtc_disable_planes(struct drm_crtc *crtc, unsigned plane_mask
 		to_intel_plane(p)->disable_plane(to_intel_plane(p), intel_crtc);
 	spin_unlock_irq(&dev_priv->uncore.lock);
 
+	intel_wait_for_vblank(dev_priv, crtc->pipe);
+
 	/*
 	 * FIXME: Once we grow proper nuclear flip support out of this we need
 	 * to compute the mask of flip planes precisely. For the time being