From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> New version of the bigjoiner cleanup. Bunch of stuff already merged, and the bigjoiner specific stuff is all reviewed now. So all we're left to contend is the PSR related stuff at the start. I slapped a new patch at the start which hopefully sorts out the planes vs. PSR sticking point for full modesets and lets us go back to the simpler modeset sequence. Cc: José Roberto de Souza <jose.souza@xxxxxxxxx> Cc: Manasi Navare <manasi.d.navare@xxxxxxxxx> Ville Syrjälä (9): drm/i915/psr: Disable PSR before modesets turn off all planes Revert "drm/i915/display: Disable audio, DRRS and PSR before planes" drm/i915: Disable all planes before modesetting any pipes drm/i915: Introduce intel_master_crtc() drm/i915: Simplify intel_crtc_copy_uapi_to_hw_state_nomodeset() drm/i915: Split PPS write from DSC enable drm/i915: Perform correct cpu_transcoder readout for bigjoiner drm/i915: Reduce bigjoiner special casing drm/i915: Nuke PIPE_CONFIG_QUIRK_BIGJOINER_SLAVE drivers/gpu/drm/i915/display/icl_dsi.c | 6 +- drivers/gpu/drm/i915/display/intel_ddi.c | 66 +-- drivers/gpu/drm/i915/display/intel_display.c | 433 ++++++++---------- .../drm/i915/display/intel_display_types.h | 5 - drivers/gpu/drm/i915/display/intel_dp.c | 2 +- drivers/gpu/drm/i915/display/intel_dp_mst.c | 14 +- drivers/gpu/drm/i915/display/intel_psr.c | 25 +- drivers/gpu/drm/i915/display/intel_psr.h | 3 +- drivers/gpu/drm/i915/display/intel_vdsc.c | 33 +- drivers/gpu/drm/i915/display/intel_vdsc.h | 10 +- 10 files changed, 268 insertions(+), 329 deletions(-) -- 2.32.0