Merge drm/drm-next into drm-intel-next

Backmerge to sync the DP MST atomic changes to drm-intel-next.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --cc drivers/gpu/drm/i915/display/i9xx_plane.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_atomic.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_atomic_plane.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_cursor.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_dp.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_dp_mst.c
index eafcc24f4f73c7cb047d867b185b6df9dde000ad,7713c19042f34338f1b684d75802bfaf27f0c3fc..5adfd226d6c4f2863d08229b8b28ea423a348c4b
--- 1/drivers/gpu/drm/i915/display/intel_dp_mst.c
--- 2/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@@ -57,8 -58,13 +58,12 @@@ static int intel_dp_mst_compute_link_co
        struct drm_i915_private *i915 = to_i915(connector->base.dev);
        const struct drm_display_mode *adjusted_mode =
                &crtc_state->hw.adjusted_mode;
 -      bool constant_n = drm_dp_has_quirk(&intel_dp->desc, DP_DPCD_QUIRK_CONSTANT_N);
        int bpp, slots = -EINVAL;
  
+       mst_state = drm_atomic_get_mst_topology_state(state, &intel_dp->mst_mgr);
+       if (IS_ERR(mst_state))
+               return PTR_ERR(mst_state);
+ 
        crtc_state->lane_count = limits->max_lane_count;
        crtc_state->port_clock = limits->max_rate;
  

diff --cc drivers/gpu/drm/i915/display/intel_hdcp.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/skl_universal_plane.c
Simple merge