I inadvertently pushed some patches this morning that ended up conflicting with Dave's series [1], so here's a rebase. Two patches in the end are missing Dave's Signed-off-by. I also fixed some HDRTEST issues. Dave, could I persuade you to enable CONFIG_DRM_I915_WERROR=y when building i915 please? It'll keep the headers clean. BR, Jani. [1] https://patchwork.freedesktop.org/series/85846/ Dave Airlie (11): drm/i915: refactor some crtc code out of intel display. (v2) drm/i915: refactor pll code out into intel_dpll.c drm/i915: split fdi code out from intel_display.c drm/i915: refactor ddi translations into a separate file drm/i915: migrate hsw fdi code to new file. drm/i915: migrate skl planes code new file (v3) drm/i915: move pipe update code into crtc. 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 drivers/gpu/drm/i915/Makefile | 7 +- 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 | 1 + drivers/gpu/drm/i915/display/intel_crt.c | 1 + drivers/gpu/drm/i915/display/intel_crtc.c | 564 +++ drivers/gpu/drm/i915/display/intel_crtc.h | 22 + drivers/gpu/drm/i915/display/intel_ddi.c | 1559 +----- drivers/gpu/drm/i915/display/intel_ddi.h | 8 +- .../drm/i915/display/intel_ddi_buf_trans.c | 1358 ++++++ .../drm/i915/display/intel_ddi_buf_trans.h | 100 + drivers/gpu/drm/i915/display/intel_display.c | 4193 +---------------- drivers/gpu/drm/i915/display/intel_display.h | 34 +- .../drm/i915/display/intel_display_types.h | 51 + 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 | 1872 ++++++++ drivers/gpu/drm/i915/display/intel_dpll.h | 41 + drivers/gpu/drm/i915/display/intel_fdi.c | 822 ++++ drivers/gpu/drm/i915/display/intel_fdi.h | 25 + 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 | 1662 +------ drivers/gpu/drm/i915/display/intel_sprite.h | 6 +- .../drm/i915/display/skl_universal_plane.c | 2263 +++++++++ .../drm/i915/display/skl_universal_plane.h | 33 + drivers/gpu/drm/i915/display/vlv_dsi.c | 1 + drivers/gpu/drm/i915/intel_pm.c | 1 + 28 files changed, 7522 insertions(+), 7233 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_crtc.c create mode 100644 drivers/gpu/drm/i915/display/intel_crtc.h 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/intel_dpll.c create mode 100644 drivers/gpu/drm/i915/display/intel_dpll.h create mode 100644 drivers/gpu/drm/i915/display/intel_fdi.c create mode 100644 drivers/gpu/drm/i915/display/intel_fdi.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
