Backmerge v5.5-rc7 into drm-next

msm needs 5.5-rc4, go to the latest.

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/gpu/drm/drm_fb_helper.c
index 57f5106,d8e8f39..4c7cbce
--- 1/drivers/gpu/drm/drm_fb_helper.c
--- 2/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@@ -1267,10 -1283,10 +1267,10 @@@ int drm_fb_helper_check_var(struct fb_v
         * Changes struct fb_var_screeninfo are currently not pushed back
         * to KMS, hence fail if different settings are requested.
         */
-       if (var->bits_per_pixel != fb->format->cpp[0] * 8 ||
+       if (var->bits_per_pixel > fb->format->cpp[0] * 8 ||
            var->xres > fb->width || var->yres > fb->height ||
            var->xres_virtual > fb->width || var->yres_virtual > fb->height) {
 -              DRM_DEBUG("fb requested width/height/bpp can't fit in current fb "
 +              drm_dbg_kms(dev, "fb requested width/height/bpp can't fit in current fb "
                          "request %dx%d-%d (virtual %dx%d) > %dx%d-%d\n",
                          var->xres, var->yres, var->bits_per_pixel,
                          var->xres_virtual, var->yres_virtual,

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

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

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

diff --cc drivers/gpu/drm/mediatek/mtk_dsi.c
Simple merge

diff --cc drivers/gpu/drm/virtio/virtgpu_plane.c
Simple merge

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