Merge v5.8-rc6 into drm-next

I've got a silent conflict + two trees based on fixes to merge.

Fixes a silent merge with amdgpu

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/dma-buf/dma-buf.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
Simple merge

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

diff --cc drivers/gpu/drm/aspeed/aspeed_gfx_drv.c
Simple merge

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

diff --cc drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
Simple merge

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

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

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

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

diff --cc drivers/gpu/drm/i915/gvt/handlers.c
index 26cae4846c827eea2170b39f9472924a9cf2cb8f,fadd2adb803072ed6309883d3c5b282c07151309..78ba2857144e0c7016128e3ddb14fee2724a6c64
--- 1/drivers/gpu/drm/i915/gvt/handlers.c
--- 2/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@@ -1734,9 -1731,8 +1734,9 @@@ static int ring_mode_mmio_write(struct 
                return 0;
        }
  
 -      if (IS_COFFEELAKE(vgpu->gvt->gt->i915) &&
 +      if ((IS_COFFEELAKE(vgpu->gvt->gt->i915) ||
 +           IS_COMETLAKE(vgpu->gvt->gt->i915)) &&
-           data & _MASKED_BIT_ENABLE(2)) {
+           IS_MASKED_BITS_ENABLED(data, 2)) {
                enter_failsafe_mode(vgpu, GVT_FAILSAFE_UNSUPPORTED_GUEST);
                return 0;
        }

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

diff --cc drivers/gpu/drm/i915/i915_vma.c
index 7fe1f317cd2bcc889d977692e462caa98334b614,1f9cd33b35cb33afa3cd90d02f8b433398af8f52..8dde2415a0ef7459d51ab7e180f36d5956899841
--- 1/drivers/gpu/drm/i915/i915_vma.c
--- 2/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@@ -196,17 -196,12 +196,19 @@@ vma_create(struct drm_i915_gem_object *
                 * and dispose of ours.
                 */
                cmp = i915_vma_compare(pos, vm, view);
 +              if (cmp == 0) {
 +                      spin_unlock(&obj->vma.lock);
 +                      i915_vm_put(vm);
 +                      i915_vma_free(vma);
 +                      return pos;
 +              }
 +
                if (cmp < 0)
                        p = &rb->rb_right;
-               else
+               else if (cmp > 0)
                        p = &rb->rb_left;
+               else
+                       goto err_unlock;
        }
        rb_link_node(&vma->obj_node, rb, p);
        rb_insert_color(&vma->obj_node, &obj->vma.tree);

diff --cc drivers/gpu/drm/mcde/mcde_drv.c
Simple merge

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

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

diff --cc drivers/gpu/drm/meson/meson_registers.h
Simple merge

diff --cc drivers/gpu/drm/msm/adreno/a6xx_gpu.c
Simple merge

diff --cc drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
Simple merge

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

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

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

diff --cc drivers/gpu/drm/panel/panel-simple.c
Simple merge

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

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

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

diff --cc drivers/video/fbdev/core/fbcon.c
Simple merge