Hi, This patch series changes the legacy modeset path to be a lot more atomic like. Among other things, it - unifies the flip-only and the modeset path; - implements a full state swap as part of the modeset; - gets rid of the recovery logic in case of a failed modeset; - replaces some i915 functions with drm atomic helper ones. Some of these patches were sent previously and the feedback so far has been addressed. I also rebased this on top Maarten's series that simplifies plane enabling/disabling. Thanks, Ander Ander Conselvan de Oliveira (28): drm/i915: Don't check for NULL before freeing state drm/i915: Call drm helpers when duplicating crtc and plane states drm/i915: Use for_each_connector_in_state helper macro drm/i915: Extract mode_changed computation out of stage_output_config() drm/i915: Add crtc states before calling compute_config() drm/i915: Don't pretend we can calculate multiple pipe_configs drm/i915: Calculate a new pipe_config based on new enabled state drm/i915: Remove all *_pipes flags from modeset drm/i915: Remove saved_mode from __intel_set_mode() drm/i915: Move compute part of __intel_set_mode() to separate function drm/i915: Simplify error handling in __intel_set_mode() drm/i915: Don't modeset with old mode when set_crtc fails drm/i915: Add primary plane to atomic state in legacy modeset drm/i915: Delete fb, x and y parameters from mode set functions drm/i915: Don't use struct intel_set_config *_changed flags drm/i915: Don't use staged config to calculate mode_changed flags drm/i915: Unify modeset and flip paths of intel_crtc_set_config() drm/i915: Simplify intel_set_config_compute_mode_changes() a bit drm/i915: Stage new modeset state straight into atomic state drm/i915: Remove save/restore logic from intel_crtc_set_config() drm/i915: Update crtc state active flag based on DPMS drm/atomic: Make mode_fixup() optional for check_modeset() drm/i915: Use atomic helpers for computing changed flags drm/i915: Take ownership of atomic state on success in intel_set_mode() drm/i915: Preserve shared DPLL information in new pipe_config drm/i915: Don't use plane update helper in legacy mode set drm/i915: Swap atomic state in legacy modeset drm/i915: Get rid of intel_crtc_set_state() Maarten Lankhorst (7): drm/i915: Remove implicitly disabling primary plane for now drm/i915: Add a way to disable planes without updating state drm/i915: Use the disable callback for disabling planes. drm/i915: get rid of primary_enabled and use atomic state drm/i915: Move intel_(pre_disable/post_enable)_primary to intel_display.c, and use it there. drm/i915: Rename intel_crtc_dpms_overlay. drm/i915: Move toggling planes out of crtc enable/disable. drivers/gpu/drm/drm_atomic_helper.c | 5 + drivers/gpu/drm/i915/i915_debugfs.c | 6 +- drivers/gpu/drm/i915/i915_drv.h | 5 + drivers/gpu/drm/i915/intel_atomic.c | 8 +- drivers/gpu/drm/i915/intel_atomic_plane.c | 20 +- drivers/gpu/drm/i915/intel_ddi.c | 9 +- drivers/gpu/drm/i915/intel_display.c | 1491 ++++++++++++----------------- drivers/gpu/drm/i915/intel_dp_mst.c | 13 +- drivers/gpu/drm/i915/intel_drv.h | 21 +- drivers/gpu/drm/i915/intel_fbc.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 7 +- drivers/gpu/drm/i915/intel_sprite.c | 127 +-- 12 files changed, 683 insertions(+), 1031 deletions(-) -- 2.1.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx