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

drm-next has been forwarded to 5.0-rc1, and we need it to apply the damage
helper for dirtyfb series from Noralf Trønnes.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>

diff --cc Documentation/gpu/drm-kms-helpers.rst
Simple merge

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

diff --cc drivers/gpu/drm/drm_crtc.c
Simple merge

diff --cc drivers/gpu/drm/drm_fb_helper.c
Simple merge

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

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

diff --cc drivers/gpu/drm/i915/intel_drv.h
Simple merge

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

diff --cc drivers/gpu/drm/meson/meson_dw_hdmi.c
Simple merge

diff --cc drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c
Simple merge

diff --cc drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c
Simple merge

diff --cc drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c
Simple merge

diff --cc drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c
Simple merge

diff --cc drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
Simple merge

diff --cc drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
Simple merge

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

diff --cc drivers/gpu/drm/omapdrm/omap_encoder.c
index 4566e0a,933ebc9..148b6b2
--- 1/drivers/gpu/drm/omapdrm/omap_encoder.c
--- 2/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@@ -52,6 -52,37 +52,37 @@@ static const struct drm_encoder_funcs o
        .destroy = omap_encoder_destroy,
  };
  
 -              r = drm_hdmi_avi_infoframe_from_display_mode(&avi, adjusted_mode,
 -                                                           false);
+ static void omap_encoder_hdmi_mode_set(struct drm_encoder *encoder,
+                                      struct drm_display_mode *adjusted_mode)
+ {
+       struct drm_device *dev = encoder->dev;
+       struct omap_encoder *omap_encoder = to_omap_encoder(encoder);
+       struct omap_dss_device *dssdev = omap_encoder->output;
+       struct drm_connector *connector;
+       bool hdmi_mode;
+ 
+       hdmi_mode = false;
+       list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+               if (connector->encoder == encoder) {
+                       hdmi_mode = omap_connector_get_hdmi_mode(connector);
+                       break;
+               }
+       }
+ 
+       if (dssdev->ops->hdmi.set_hdmi_mode)
+               dssdev->ops->hdmi.set_hdmi_mode(dssdev, hdmi_mode);
+ 
+       if (hdmi_mode && dssdev->ops->hdmi.set_infoframe) {
+               struct hdmi_avi_infoframe avi;
+               int r;
+ 
++              r = drm_hdmi_avi_infoframe_from_display_mode(&avi, connector,
++                                                           adjusted_mode);
+               if (r == 0)
+                       dssdev->ops->hdmi.set_infoframe(dssdev, &avi);
+       }
+ }
+ 
  static void omap_encoder_mode_set(struct drm_encoder *encoder,
                                  struct drm_display_mode *mode,
                                  struct drm_display_mode *adjusted_mode)

diff --cc drivers/gpu/drm/tegra/sor.c
Simple merge

diff --cc include/drm/drm_connector.h
Simple merge

diff --cc include/drm/drm_crtc.h
Simple merge