--- intel_display.c.bak	2018-11-08 20:54:59.159100529 +0000
+++ intel_display.c	2018-11-08 20:55:26.502090012 +0000
@@ -13028,16 +13028,7 @@
 	 * FIXME doing watermarks and fb cleanup from a vblank worker
 	 * (assuming we had any) would solve these problems.
 	 */
-	if (INTEL_GEN(dev_priv) < 9 && state->legacy_cursor_update) {
-		struct intel_crtc_state *new_crtc_state;
-		struct intel_crtc *crtc;
-		int i;
-
-		for_each_new_intel_crtc_in_state(intel_state, crtc, new_crtc_state, i)
-			if (new_crtc_state->wm.need_postvbl_update ||
-			    new_crtc_state->update_wm_post)
-				state->legacy_cursor_update = false;
-	}
+	state->legacy_cursor_update = false;
 
 	ret = intel_atomic_prepare_commit(dev, state);
 	if (ret) {