After fixing up some earlier patches it turns out I had to rework the rest and improved the individual patches. There were some changes in upstream, which meant I had to redo most of them. The order of patches is slightly changed, the update watermark comes before killing off wait_vblank because it has a dependency on it. Maarten Lankhorst (14): drm/i915: Use passed plane state for sprite planes, v3. drm/i915: Extend DSL readout fix to BDW and SKL. drm/i915: Do not acquire crtc state to check clock during modeset, v2. drm/i915: Handle cdclk limits on broadwell. drm/i915/bxt: Use the bypass frequency if there are no active pipes. drm/i915: Update watermark related members in the crtc_state, v2. drm/i915: Kill off intel_crtc->atomic.wait_vblank. 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. drm/i915: Nuke fbc members from intel_crtc->atomic. drm/i915/skl: Update watermarks before the crtc is disabled. drm/i915/skl: Do not allow scaling when crtc is disabled. drivers/gpu/drm/i915/i915_drv.h | 5 + drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/intel_atomic.c | 6 +- drivers/gpu/drm/i915/intel_display.c | 459 ++++++++++++++++++++--------------- drivers/gpu/drm/i915/intel_drv.h | 47 ++-- drivers/gpu/drm/i915/intel_sprite.c | 120 ++++----- 6 files changed, 358 insertions(+), 281 deletions(-) -- 2.1.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
