From: Thomas Zimmermann <tzimmermann@suse.de>
Date: Thu, 28 May 2026 09:27:53 +0000 (+0200)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a544da908a70240c3f379b374c35789e04710d42;p=thirdparty%2Fkernel%2Flinux.git

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>
---

a544da908a70240c3f379b374c35789e04710d42
diff --cc drivers/accel/amdxdna/amdxdna_ubuf.c
index 4c0647057759f,bb60fb80467ef..0e0cd69cd1fbf
--- a/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)
  {