Pushed patches 1-4 in this series (with some very small style changes to make checkpatch happy), drm-intel-nightly also rebuilt.
On Fri, 2016-10-14 at 17:31 -0400, Lyude wrote: > While it (mostly) works, the code for handling watermarks on Skylake > has been > kind of ugly for a while. As well a lot of it isn't that friendly to > atomic > transactions, Lots of copy paste, redundant wm values, etc. While > this isn't a > full cleanup, it's a good start. As well, we add a couple of features > for > making debugging watermarks a little easier. > > Rebased for latest nightly, new r-bs added + some changes > > Lyude (10): >  drm/i915/skl: Move per-pipe ddb allocations into crtc states >  drm/i915/skl: Remove linetime from skl_wm_values >  drm/i915/gen9: Make skl_wm_level per-plane >  drm/i915/gen9: Cleanup skl_pipe_wm_active_state >  drm/i915/gen9: Get rid of redundant watermark values >  drm/i915/gen9: Add ddb changes to atomic debug output >  drm/i915/gen9: Make skl_pipe_wm_get_hw_state() reusable >  drm/i915/gen9: Add skl_wm_level_equals() >  drm/i915/gen9: Actually verify WM levels in verify_wm_state() >  drm/i915/gen9: Don't wrap strings in verify_wm_state() > >  drivers/gpu/drm/i915/i915_drv.h      |  10 +- >  drivers/gpu/drm/i915/intel_display.c | 138 ++++++++--- >  drivers/gpu/drm/i915/intel_drv.h     |  24 +- >  drivers/gpu/drm/i915/intel_pm.c      | 466 +++++++++++++++++------ > ------------ >  drivers/gpu/drm/i915/intel_sprite.c  |   8 +- >  5 files changed, 355 insertions(+), 291 deletions(-) > -- Cheers, Lyude