Implement Display WA #1136 for SKL/BXT.
Bspec: 21664
Signed-off-by: Jouni Högander <jouni.hogander@xxxxxxxxx>
---
drivers/gpu/drm/i915/display/intel_psr.c | 12 ++++++++++++
drivers/gpu/drm/i915/display/skl_watermark.c | 5 -----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 1b40d9c73c18..ad058b67f4f8 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1940,11 +1940,18 @@ void intel_psr_pre_plane_update(struct intel_atomic_state *state,
/*
* Wa_16013835468
* Wa_14015648006
+ * Display WA #1136: skl, bxt
*/
static void wa_16013835468(struct intel_dp *intel_dp, bool wm_level_disabled)
{
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
+ if (DISPLAY_VER(dev_priv) <= 9 && wm_level_disabled &&
+ intel_dp->psr.enabled) {
+ intel_psr_disable_locked(intel_dp);
+ return;
+ }
+
if (!IS_MTL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0) &&
!IS_DISPLAY_VER(dev_priv, 11, 13))
return;
@@ -1981,12 +1988,17 @@ static void _intel_psr_post_plane_update(const struct intel_atomic_state *state,
keep_disabled |= psr->sink_not_reliable;
keep_disabled |= !new_crtc_state->active_planes;
+ /* Display WA #1136: skl, bxt */
+ keep_disabled |= DISPLAY_VER(dev_priv) <= 9 &&
+ new_crtc_state->wm_level_disabled;
+
if (!psr->enabled && !keep_disabled)
intel_psr_enable_locked(intel_dp, new_crtc_state);
/*
* Wa_16013835468
* Wa_14015648006
+ * Display WA #1136: skl, bxt
*/
if (old_crtc_state->wm_level_disabled !=
new_crtc_state->wm_level_disabled)
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index afb751c024ba..ced61da8b496 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -2278,11 +2278,6 @@ static int skl_wm_check_vblank(struct intel_crtc_state *crtc_state)
*/
crtc_state->wm_level_disabled = level < i915->display.wm.num_levels - 1;
- /*
- * FIXME also related to skl+ w/a 1136 (also unimplemented as of
- * now) perhaps?
- */
-
for (level++; level < i915->display.wm.num_levels; level++) {
enum plane_id plane_id;
--
2.34.1
