drm/i915: Enable transition watermarks for glk

We are mistakenly skipping transition watermarks on glk. Fix
up the condition for glk, and toss in the w/a name from
the database.

v2: Reorder the ipc enabled vs. platform check to be more sensible

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> #v1
Link: https://patchwork.freedesktop.org/patch/msgid/20200228203552.30273-3-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index b02cb00..3501c33 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5124,14 +5124,17 @@ static void skl_compute_transition_wm(const struct intel_crtc_state *crtc_state,
        const u16 trans_amount = 10; /* This is configurable amount */
        u16 wm0_sel_res_b, trans_offset_b, res_blocks;
 
-       /* Transition WM are not recommended by HW team for GEN9 */
-       if (INTEL_GEN(dev_priv) <= 9)
-               return;
-
        /* Transition WM don't make any sense if ipc is disabled */
        if (!dev_priv->ipc_enabled)
                return;
 
+       /*
+        * WaDisableTWM:skl,kbl,cfl,bxt
+        * Transition WM are not recommended by HW team for GEN9
+        */
+       if (IS_GEN9_BC(dev_priv) || IS_BROXTON(dev_priv))
+               return;
+
        trans_min = 14;
        if (INTEL_GEN(dev_priv) >= 11)
                trans_min = 4;