Patches #3 and #4 here are the final two patches from the atomic watermark series that was posted here: http://lists.freedesktop.org/archives/intel-gfx/2015-September/076634.html We had to pull those out when Jani reported a BDW boot regression (divide by zero during watermark calculation). Although we never found a smoking gun for that divide by zero, I haven't been able to reproduce the issue on a similar system. There's been a lot of code churn since that time, so I'm hoping that we've either already fixed the issue without realizing it, or that the extra paranoia added in patch #2 here will avoid the crash and highlight the culprit. The first patch here solves a legitimate bug that could cause a divide-by-zero (just not the one Jani was seeing). The second patch adds extra guards on divide operations to verify our invariants and ensure that bugs elsewhere in the driver can't lead to a fatal divide-by-zero (at least on the ILK codepaths). Please don't merge #3 or #4 here until we at least get a positive test result from Jani. Matt Roper (4): drm/i915: Convert hsw_compute_linetime_wm to use in-flight state drm/i915: Add extra paranoia to ILK watermark calculations drm/i915: Sanitize watermarks after hardware state readout drm/i915: Add two-stage ILK-style watermark programming (v6) drivers/gpu/drm/i915/i915_drv.h | 5 + drivers/gpu/drm/i915/intel_atomic.c | 1 + drivers/gpu/drm/i915/intel_display.c | 137 +++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_drv.h | 31 +++++- drivers/gpu/drm/i915/intel_pm.c | 186 +++++++++++++++++++++++++---------- 5 files changed, 305 insertions(+), 55 deletions(-) -- 2.1.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx