Commit f96198ab authored by Matt Atwood's avatar Matt Atwood Committed by Matt Roper

drm/i915/ehl: extended Wa_2006604312 to ehl

Reflect recent bspec changes.

Bspec: 33451
Signed-off-by: default avatarMatt Atwood <matthew.s.atwood@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200413175322.12162-1-matthew.s.atwood@intel.comReviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
parent 7b994759
...@@ -525,7 +525,7 @@ skl_wa_827(struct drm_i915_private *dev_priv, enum pipe pipe, bool enable) ...@@ -525,7 +525,7 @@ skl_wa_827(struct drm_i915_private *dev_priv, enum pipe pipe, bool enable)
intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) & ~(DUPS1_GATING_DIS | DUPS2_GATING_DIS)); intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) & ~(DUPS1_GATING_DIS | DUPS2_GATING_DIS));
} }
/* Wa_2006604312:icl */ /* Wa_2006604312:icl,ehl */
static void static void
icl_wa_scalerclkgating(struct drm_i915_private *dev_priv, enum pipe pipe, icl_wa_scalerclkgating(struct drm_i915_private *dev_priv, enum pipe pipe,
bool enable) bool enable)
...@@ -6438,8 +6438,8 @@ static bool needs_scalerclk_wa(const struct intel_crtc_state *crtc_state) ...@@ -6438,8 +6438,8 @@ static bool needs_scalerclk_wa(const struct intel_crtc_state *crtc_state)
{ {
struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev); struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
/* Wa_2006604312:icl */ /* Wa_2006604312:icl,ehl */
if (crtc_state->scaler_state.scaler_users > 0 && IS_ICELAKE(dev_priv)) if (crtc_state->scaler_state.scaler_users > 0 && IS_GEN(dev_priv, 11))
return true; return true;
return false; return false;
...@@ -6509,7 +6509,7 @@ static void intel_pre_plane_update(struct intel_atomic_state *state, ...@@ -6509,7 +6509,7 @@ static void intel_pre_plane_update(struct intel_atomic_state *state,
needs_nv12_wa(new_crtc_state)) needs_nv12_wa(new_crtc_state))
skl_wa_827(dev_priv, pipe, true); skl_wa_827(dev_priv, pipe, true);
/* Wa_2006604312:icl */ /* Wa_2006604312:icl,ehl */
if (!needs_scalerclk_wa(old_crtc_state) && if (!needs_scalerclk_wa(old_crtc_state) &&
needs_scalerclk_wa(new_crtc_state)) needs_scalerclk_wa(new_crtc_state))
icl_wa_scalerclkgating(dev_priv, pipe, true); icl_wa_scalerclkgating(dev_priv, pipe, true);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment