Merge drm/drm-next into drm-misc-next

Bring rc1 to start the new release dev.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

diff --cc CREDITS
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge

diff --cc drivers/accel/ivpu/ivpu_mmu_context.c
Simple merge

diff --cc drivers/accel/ivpu/ivpu_pm.c
Simple merge

diff --cc drivers/bus/mhi/host/boot.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
Simple merge

diff --cc drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
Simple merge

diff --cc drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
Simple merge

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

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

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

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

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

diff --cc drivers/gpu/drm/i915/display/intel_crt.c
index 69667cd49ec84ece9abd35b7d6fc4f98192788a8,4634d3fd9f2019506d16777f2186cb36963e31c4..968ac705c3c6a2c7eb255054b6180393e7ed0701
--- 1/drivers/gpu/drm/i915/display/intel_crt.c
--- 2/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@@ -352,11 -358,10 +358,10 @@@ static void intel_enable_crt(struct int
  
  static enum drm_mode_status
  intel_crt_mode_valid(struct drm_connector *connector,
 -                   struct drm_display_mode *mode)
 +                   const struct drm_display_mode *mode)
  {
        struct intel_display *display = to_intel_display(connector->dev);
-       struct drm_device *dev = connector->dev;
-       struct drm_i915_private *dev_priv = to_i915(dev);
+       struct drm_i915_private *dev_priv = to_i915(connector->dev);
        int max_dotclk = display->cdclk.max_dotclk_freq;
        enum drm_mode_status status;
        int max_clock;

diff --cc drivers/gpu/drm/i915/display/intel_ddi.c
index a70e7f263a899f8349c56f345799d41e4cf2625c,acb986bc1f33a2e8489a0ad45cfd93f1ab5e24b8..0aec4b958af655378f2dbd3d3dbc4b73b5946ed0
--- 1/drivers/gpu/drm/i915/display/intel_ddi.c
--- 2/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@@ -2546,7 -2594,7 +2594,8 @@@ static void mtl_ddi_pre_enable_dp(struc
  {
        struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
        bool is_mst = intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST);
 +      bool transparent_mode;
+       int ret;
  
        intel_dp_set_link_params(intel_dp,
                                 crtc_state->port_clock,

diff --cc drivers/gpu/drm/i915/display/intel_dp.c
index ea4f775b12a1da428f116440ad16db5baf7fa771,f1f3b1bb1e89b2c3c2f5ba75178d100131305331..1ad25c37f3c246ef19caf2f3680ca804c0036cba
--- 1/drivers/gpu/drm/i915/display/intel_dp.c
--- 2/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@@ -1371,8 -1391,9 +1391,9 @@@ bool intel_dp_has_dsc(const struct inte
  
  static enum drm_mode_status
  intel_dp_mode_valid(struct drm_connector *_connector,
 -                  struct drm_display_mode *mode)
 +                  const struct drm_display_mode *mode)
  {
+       struct intel_display *display = to_intel_display(_connector->dev);
        struct intel_connector *connector = to_intel_connector(_connector);
        struct intel_dp *intel_dp = intel_attached_dp(connector);
        struct drm_i915_private *dev_priv = to_i915(connector->base.dev);

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

diff --cc drivers/gpu/drm/i915/display/intel_dp_mst.c
index 0812a3fd8b376b3572e259f13d29a608ebc0f8ff,0c44fc7dd86cef471df5787e8284d9313b98b215..227bd2783e64105dc8dd521b99e7d04ce2e577cc
--- 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
@@@ -1431,8 -1418,8 +1418,8 @@@ static int mst_connector_get_modes(stru
  }
  
  static int
- intel_dp_mst_mode_valid_ctx(struct drm_connector *connector,
+ mst_connector_mode_valid_ctx(struct drm_connector *connector,
 -                           struct drm_display_mode *mode,
 +                           const struct drm_display_mode *mode,
                             struct drm_modeset_acquire_ctx *ctx,
                             enum drm_mode_status *status)
  {

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

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

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

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

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

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

diff --cc drivers/gpu/drm/nouveau/dispnv50/disp.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_drm.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_bo.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_resource.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
Simple merge

diff --cc include/drm/display/drm_dp_mst_helper.h
Simple merge

diff --cc include/drm/display/drm_hdmi_state_helper.h
Simple merge

diff --cc include/drm/ttm/ttm_resource.h
Simple merge