This patch series applies on top of Lyude's patches. They clean up the remainder of SKL style wm's, and finally makes SKL watermarks ready for nonblocking modeset by using the crtc_state for watermarks as much as possible. Maarten Lankhorst (8): drm/i915/skl+: Prepare for removing data rate from skl watermark state drm/i915/skl+: Remove data_rate from watermark struct. drm/i915/skl+: Remove minimum block allocation from crtc state. drm/i915/skl+: Clean up minimum allocations. drm/i915: Add a atomic evasion step to watermark programming. drm/i915/gen9+: Use the watermarks from crtc_state for everything. drm/i915/gen9+: Program watermarks as a separate step during evasion drm/i915/gen9+: Preserve old allocation from crtc_state. drivers/gpu/drm/i915/i915_drv.h | 13 +-- drivers/gpu/drm/i915/intel_display.c | 58 ++++------ drivers/gpu/drm/i915/intel_drv.h | 16 --- drivers/gpu/drm/i915/intel_pm.c | 206 +++++++++++++++++++---------------- drivers/gpu/drm/i915/intel_sprite.c | 18 --- 5 files changed, 136 insertions(+), 175 deletions(-) -- 2.7.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx