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

Backmerging to get GEM LRU fixes from commit 379e8f1c ("drm/gem: Make
the GEM LRU lock part of drm_device") and other updates from v7.1-rc5.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

diff --cc drivers/accel/amdxdna/amdxdna_ubuf.c
index 4c0647057759f82c472587b9cebf14bbadf1f967,bb60fb80467ef8486b4c72de1bbd8b12dcdd8626..0e0cd69cd1fbfcae3c5c3a282372403ed7801202
--- 1/drivers/accel/amdxdna/amdxdna_ubuf.c
--- 2/drivers/accel/amdxdna/amdxdna_ubuf.c
+++ b/drivers/accel/amdxdna/amdxdna_ubuf.c
@@@ -120,11 -73,28 +73,8 @@@ static const struct dma_buf_ops amdxdna
        .map_dma_buf = amdxdna_ubuf_map,
        .unmap_dma_buf = amdxdna_ubuf_unmap,
        .release = amdxdna_ubuf_release,
-       .mmap = amdxdna_ubuf_mmap,
-       .vmap = amdxdna_ubuf_vmap,
-       .vunmap = amdxdna_ubuf_vunmap,
  };
  
 -static int readonly_va_entry(struct amdxdna_drm_va_entry *va_ent)
 -{
 -      struct mm_struct *mm = current->mm;
 -      struct vm_area_struct *vma;
 -      int ret;
 -
 -      mmap_read_lock(mm);
 -
 -      vma = find_vma(mm, va_ent->vaddr);
 -      if (!vma ||
 -          vma->vm_start > va_ent->vaddr ||
 -          vma->vm_end - va_ent->vaddr < va_ent->len)
 -              ret = -ENOENT;
 -      else
 -              ret = vma->vm_flags & VM_WRITE ? 0 : 1;
 -
 -      mmap_read_unlock(mm);
 -      return ret;
 -}
 -
  struct dma_buf *amdxdna_get_ubuf(struct drm_device *dev,
                                 u32 num_entries, void __user *va_entries)
  {

diff --cc drivers/gpu/drm/bridge/ite-it66121.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_vm.c
Simple merge