]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'drm-misc-fixes-2026-05-21' of https://gitlab.freedesktop.org/drm/misc...
authorDave Airlie <airlied@redhat.com>
Thu, 21 May 2026 21:00:45 +0000 (07:00 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 21 May 2026 21:01:04 +0000 (07:01 +1000)
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
1  2 
drivers/gpu/drm/drm_gem.c
drivers/gpu/drm/msm/msm_gem_shrinker.c

Simple merge
index 6e39e4e578bba7e5e112970bb56aad8dedf09139,c07af9602fee6e15de034f917cb009a066886fb3..c8dda2b68cff2356ec13e327db4eb2fba5771270
@@@ -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;