[src/netbsd-9]: src/sys/external/bsd/drm2/linux Pull up following revision(s)...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fd40005e824c
branches:  netbsd-9
changeset: 985095:fd40005e824c
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Aug 08 10:00:16 2021 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #1327):

        sys/external/bsd/drm2/linux/linux_reservation.c: revision 1.13
        sys/external/bsd/drm2/linux/linux_reservation.c: revision 1.14

drm: Release fence if we're about to return too.

Should fix another fence leak.

XXX pullup-9

 -

drm: Plug another fence leak.

XXX pullup-9

diffstat:

 sys/external/bsd/drm2/linux/linux_reservation.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r b2d017239b50 -r fd40005e824c sys/external/bsd/drm2/linux/linux_reservation.c
--- a/sys/external/bsd/drm2/linux/linux_reservation.c   Tue Aug 03 16:14:21 2021 +0000
+++ b/sys/external/bsd/drm2/linux/linux_reservation.c   Sun Aug 08 10:00:16 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_reservation.c,v 1.11.8.1 2021/07/08 11:23:28 martin Exp $        */
+/*     $NetBSD: linux_reservation.c,v 1.11.8.2 2021/08/08 10:00:16 martin Exp $        */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_reservation.c,v 1.11.8.1 2021/07/08 11:23:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_reservation.c,v 1.11.8.2 2021/08/08 10:00:16 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/poll.h>
@@ -794,9 +794,9 @@
        KASSERT(fence != NULL);
        rcu_read_unlock();
        ret = fence_wait_timeout(fence, intr, timeout);
+       fence_put(fence);
        if (ret <= 0)
                return ret;
-       fence_put(fence);
        KASSERT(ret <= timeout);
        timeout = ret;
        goto top;
@@ -1003,6 +1003,7 @@
                 * assume the event is not ready.
                 */
                if (!claimed || callback) {
+                       fence_put(fence);
                        revents = 0;
                        break;
                }