1 files changed, 6 insertions, 11 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index b8dfdbc9ca1f..23d8008a93bb 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12768,17 +12768,12 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
                         intel_check_cpu_fifo_underruns(dev_priv);
                         intel_check_pch_fifo_underruns(dev_priv);
 
-                        if (!new_crtc_state->active) {
-                                /*
-                                 * Make sure we don't call initial_watermarks
-                                 * for ILK-style watermark updates.
-                                 *
-                                 * No clue what this is supposed to achieve.
-                                 */
-                                if (INTEL_GEN(dev_priv) >= 9)
-                                        dev_priv->display.initial_watermarks(intel_state,
-                                                                             to_intel_crtc_state(new_crtc_state));
-                        }
+                        /* FIXME unify this for all platforms */
+                        if (!new_crtc_state->active &&
+                            !HAS_GMCH_DISPLAY(dev_priv) &&
+                            dev_priv->display.initial_watermarks)
+                                dev_priv->display.initial_watermarks(intel_state,
+                                                                     to_intel_crtc_state(new_crtc_state));
                 }
         }