Module Name: src
Committed By: martin
Date: Sun Aug 8 10:00:16 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/linux [netbsd-9]: linux_reservation.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.11.8.1 -r1.11.8.2 \
src/sys/external/bsd/drm2/linux/linux_reservation.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/linux/linux_reservation.c
diff -u src/sys/external/bsd/drm2/linux/linux_reservation.c:1.11.8.1 src/sys/external/bsd/drm2/linux/linux_reservation.c:1.11.8.2
--- src/sys/external/bsd/drm2/linux/linux_reservation.c:1.11.8.1 Thu Jul 8 11:23:28 2021
+++ src/sys/external/bsd/drm2/linux/linux_reservation.c Sun Aug 8 10:00:16 2021
@@ -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 @@ wait:
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 @@ top:
* assume the event is not ready.
*/
if (!claimed || callback) {
+ fence_put(fence);
revents = 0;
break;
}
