summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2019-02-28 19:36:39 +0200
committerVille Syrjälä <ville.syrjala@linux.intel.com>2019-03-01 18:10:42 +0200
commitc384afe35200f090b10ff5b4e8c7e6ea6a54eb19 (patch)
treeb1f7b5b6a52574dff8788e0786962aa512a85290
parent3ef7114982b844f0f31c5b92919fa0f45b662079 (diff)
drm/i915: Finalize Wa_1408961008:icl
The icl wm1+ underrun w/a has been added to the spec. It changed slightly from the previous incarnation by requiring that we mirror the lines watermark and the ignore lines bit from WM0 into WM1. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190228173639.18422-1-ville.syrjala@linux.intel.com Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Tested-by: Clint Taylor <Clinton.A.Taylor@intel.com>
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 4c0e43caa5cd..9c97a95c1816 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4467,11 +4467,15 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
wm = &cstate->wm.skl.optimal.planes[plane_id];
memset(&wm->wm[level], 0, sizeof(wm->wm[level]));
- /* W/A for underruns with WM1+ disabled */
+ /*
+ * Wa_1408961008:icl
+ * Underruns with WM1+ disabled
+ */
if (IS_ICELAKE(dev_priv) &&
level == 1 && wm->wm[0].plane_en) {
wm->wm[level].plane_res_b = wm->wm[0].plane_res_b;
- wm->wm[level].ignore_lines = true;
+ wm->wm[level].plane_res_l = wm->wm[0].plane_res_l;
+ wm->wm[level].ignore_lines = wm->wm[0].ignore_lines;
}
}
}