Rebase of [1]. Please let's try to double check the rebase and review the patches and get this merged ASAP. Part of the reason we've always put this refactoring off in the first place has been that it's a PITA with the constant conflicts. Dave's last posting of the series started conflicting before CI even tried to build it... BR, Jani. [1] https://patchwork.freedesktop.org/series/86321/ Dave Airlie (10): drm/i915: refactor ddi translations into a separate file (v2) drm/i915: migrate hsw fdi code to new file. drm/i915: migrate skl planes code new file (v5) drm/i915: move pipe update code into crtc. (v2) drm/i915: split fb scalable checks into g4x and skl versions drm/i915: move is_ccs_modifier to an inline drm/i915: migrate pll enable/disable code to intel_dpll.[ch] drm/i915: migrate i9xx plane get config drm/i915: refactor skylake scaler code into new file. drm/i915: move ddi pll state get to dpll mgr drivers/gpu/drm/i915/Makefile | 5 +- drivers/gpu/drm/i915/display/i9xx_plane.c | 123 +- drivers/gpu/drm/i915/display/i9xx_plane.h | 4 + drivers/gpu/drm/i915/display/icl_dsi.c | 2 + drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- drivers/gpu/drm/i915/display/intel_crt.c | 1 + drivers/gpu/drm/i915/display/intel_crtc.c | 258 +- drivers/gpu/drm/i915/display/intel_ddi.c | 1560 +---------- drivers/gpu/drm/i915/display/intel_ddi.h | 8 +- .../drm/i915/display/intel_ddi_buf_trans.c | 1394 ++++++++++ .../drm/i915/display/intel_ddi_buf_trans.h | 100 + drivers/gpu/drm/i915/display/intel_display.c | 2372 +---------------- drivers/gpu/drm/i915/display/intel_display.h | 37 +- .../drm/i915/display/intel_display_types.h | 36 + drivers/gpu/drm/i915/display/intel_dp.c | 1 + drivers/gpu/drm/i915/display/intel_dp_mst.c | 1 + drivers/gpu/drm/i915/display/intel_dpll.c | 509 ++++ drivers/gpu/drm/i915/display/intel_dpll.h | 18 + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 223 ++ drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 2 + drivers/gpu/drm/i915/display/intel_fdi.c | 139 + drivers/gpu/drm/i915/display/intel_fdi.h | 3 + drivers/gpu/drm/i915/display/intel_pps.c | 1 + drivers/gpu/drm/i915/display/intel_psr.c | 1 + drivers/gpu/drm/i915/display/intel_sprite.c | 1718 +----------- drivers/gpu/drm/i915/display/intel_sprite.h | 7 - drivers/gpu/drm/i915/display/skl_scaler.c | 497 ++++ drivers/gpu/drm/i915/display/skl_scaler.h | 32 + .../drm/i915/display/skl_universal_plane.c | 2266 ++++++++++++++++ .../drm/i915/display/skl_universal_plane.h | 37 + drivers/gpu/drm/i915/display/vlv_dsi.c | 1 + drivers/gpu/drm/i915/intel_pm.c | 1 + 32 files changed, 5811 insertions(+), 5548 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c create mode 100644 drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h create mode 100644 drivers/gpu/drm/i915/display/skl_scaler.c create mode 100644 drivers/gpu/drm/i915/display/skl_scaler.h create mode 100644 drivers/gpu/drm/i915/display/skl_universal_plane.c create mode 100644 drivers/gpu/drm/i915/display/skl_universal_plane.h -- 2.20.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
