From: Dave Airlie <airlied@redhat.com>
Date: Thu, 21 May 2026 21:00:45 +0000 (+1000)
Subject: Merge tag 'drm-misc-fixes-2026-05-21' of https://gitlab.freedesktop.org/drm/misc... 
X-Git-Tag: v7.1-rc5~19^2~2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=71d9e1561aab0a506f6c783a6c3e16042fd27dff;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'drm-misc-fixes-2026-05-21' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes

Short summary of fixes pull:

amdxdna:
- remove mmap and export for ubuf

bridge:
- chipone-icn6211: managed bridge cleanup
- lt66121: acquire reset GPIO
- megachips: fix clean up on failed IRQ requests

gem:
- clean up LRU locking

v3d:
- fix UAF in error code paths
- release GEM-object ref on free'd jobs

virtio:
- use uninterruptible resv locking in plane updates

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patch.msgid.link/20260521071456.GA14644@localhost.localdomain
---

71d9e1561aab0a506f6c783a6c3e16042fd27dff
diff --cc drivers/gpu/drm/msm/msm_gem_shrinker.c
index 6e39e4e578bba,c07af9602fee6..c8dda2b68cff2
--- a/drivers/gpu/drm/msm/msm_gem_shrinker.c
+++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c
@@@ -174,14 -185,11 +174,14 @@@ msm_gem_shrinker_scan(struct shrinker *
  	for (unsigned i = 0; (nr > 0) && (i < ARRAY_SIZE(stages)); i++) {
  		if (!stages[i].cond)
  			continue;
 +		/*
 +		 * 'ticket' not needed on trylock paths
 +		 */
  		stages[i].freed =
- 			drm_gem_lru_scan(stages[i].lru, nr,
+ 			drm_gem_lru_scan(priv->dev, stages[i].lru, nr,
  					 &stages[i].remaining,
  					 stages[i].shrink,
 -					 &ticket);
 +					 NULL);
  		nr -= stages[i].freed;
  		freed += stages[i].freed;
  		remaining += stages[i].remaining;