Merge tag 'v5.9-rc4' into drm-next

Backmerge 5.9-rc4 as there is a nasty qxl conflict
that needs to be resolved.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_kms.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_mst_types.c
Simple merge

diff --cc drivers/gpu/drm/ast/ast_main.c
Simple merge

diff --cc drivers/gpu/drm/bridge/ti-sn65dsi86.c
Simple merge

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

diff --cc drivers/gpu/drm/exynos/exynos_drm_dsi.c
Simple merge

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

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

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

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

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

diff --cc drivers/gpu/drm/omapdrm/dss/venc.c
Simple merge

diff --cc drivers/gpu/drm/qxl/qxl_display.c
index fa79688013b7dc21934f6776764d1934fd188bd0,099dca48b0ff36797c66f338c028011fdce757c3..6063f3a153290d4976e17259655d9cee556c3182
--- 1/drivers/gpu/drm/qxl/qxl_display.c
--- 2/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@@ -26,6 -26,6 +26,7 @@@
  #include <linux/crc32.h>
  #include <linux/delay.h>
  
++#include <drm/drm_drv.h>
  #include <drm/drm_atomic.h>
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_gem_framebuffer_helper.h>
@@@ -184,9 -183,9 +185,9 @@@ void qxl_display_read_client_monitors_c
                return;
        }
  
 -      drm_modeset_lock_all(dev);
 +      DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
        qxl_update_offset_props(qdev);
-       DRM_MODESET_LOCK_ALL_END(ctx, ret);
 -      drm_modeset_unlock_all(dev);
++      DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
        if (!drm_helper_hpd_irq_event(dev)) {
                /* notify that the monitor configuration changed, to
                   adjust at the arbitrary resolution */
@@@ -430,8 -430,7 +431,8 @@@ static int qxl_framebuffer_surface_dirt
        qxl_draw_dirty_fb(qdev, fb, qobj, flags, color,
                          clips, num_clips, inc, 0);
  
 -      drm_modeset_unlock_all(fb->dev);
 +out_lock_end:
-       DRM_MODESET_LOCK_ALL_END(ctx, ret);
++      DRM_MODESET_LOCK_ALL_END(fb->dev, ctx, ret);
  
        return 0;
  }

diff --cc drivers/gpu/drm/sun4i/sun4i_tcon.c
Simple merge

diff --cc drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
Simple merge

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