From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Move some plane stuff out from intel_display.c, introduce a scaled_planes bitmask, and using that as an excuse clean up a bunch of watermark registers. Ville Syrjälä (8): drm/i915: Move intel_plane_atomic_calc_changes() & co. out drm/i915: Introduce intel_arm_planes_on_crtc() drm/i915: Introduce scaled_planes bitmask drm/i915: Use {active,scaled}_planes to compute ilk watermarks drm/i915: Remove gen6_check_mch_setup() drm/i915: Add REG_GENMASK64() and REG_FIELD_GET64() drm/i915: Clean up SSKPD/MLTR defines drm/i915: Polish ilk+ wm register bits .../gpu/drm/i915/display/intel_atomic_plane.c | 204 +++++++++++++++++- .../gpu/drm/i915/display/intel_atomic_plane.h | 10 +- drivers/gpu/drm/i915/display/intel_display.c | 194 +---------------- .../drm/i915/display/intel_display_debugfs.c | 2 +- .../drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 68 +++--- drivers/gpu/drm/i915/i915_reg_defs.h | 57 +++-- drivers/gpu/drm/i915/intel_pm.c | 104 ++++----- 8 files changed, 322 insertions(+), 318 deletions(-) -- 2.34.1