There are a couple of WARN_ON(!wm_changed); on skl, those should be gone with the skylake wm patch. intel_crtc->atomic is a remnant from a transitional era, and it's time to kill it. :) This series applies on top of [PATCH 0/4] cdclk fixes and perhaps (didn't check if it needed it) [PATCH 0/8] Make plane updates use the atomic state. Maarten Lankhorst (12): drm/i915: Move disable_cxsr to the crtc_state. drm/i915: Calculate watermark related members in the crtc_state, v3. drm/i915/skl: Update watermarks before the crtc is disabled. drm/i915: Remove double wait_for_vblank on broadwell. drm/i915: Kill off intel_crtc->atomic.wait_vblank, v2. drm/i915: Remove intel_crtc->atomic.disable_ips. drm/i915: Remove atomic.pre_disable_primary. drm/i915: Remove update_sprite_watermarks. drm/i915: Remove some post-commit members from intel_crtc->atomic, v2. drm/i915: Nuke fbc members from intel_crtc->atomic. drm/i915: Keep track of the cdclk as if all crtc's were active. drm/i915: Calculate visibility in check_plane correctly regardless of dpms. drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_atomic.c | 4 + drivers/gpu/drm/i915/intel_atomic_plane.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 352 +++++++++++++++++------------- drivers/gpu/drm/i915/intel_drv.h | 36 +-- 5 files changed, 213 insertions(+), 185 deletions(-) -- 2.1.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx