Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:23:34 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/linux: linux_dma_fence.c
Log Message:
drm: In dma_fence_wait_timeout, allow MAX_SCHEDULE_TIMEOUT.
In the Linux API, this means wait forever.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/external/bsd/drm2/linux/linux_dma_fence.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_dma_fence.c
diff -u src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.27 src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.28
--- src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.27 Sun Dec 19 12:23:27 2021
+++ src/sys/external/bsd/drm2/linux/linux_dma_fence.c Sun Dec 19 12:23:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_dma_fence.c,v 1.27 2021/12/19 12:23:27 riastradh Exp $ */
+/* $NetBSD: linux_dma_fence.c,v 1.28 2021/12/19 12:23:34 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_dma_fence.c,v 1.27 2021/12/19 12:23:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_dma_fence.c,v 1.28 2021/12/19 12:23:34 riastradh Exp $");
#include <sys/atomic.h>
#include <sys/condvar.h>
@@ -816,8 +816,8 @@ out0: return ret;
* signalled before the timeout. Works by calling the fence wait
* callback.
*
- * The timeout must be nonnegative and less than
- * MAX_SCHEDULE_TIMEOUT.
+ * The timeout must be nonnegative and at most
+ * MAX_SCHEDULE_TIMEOUT, which means wait indefinitely.
*/
long
dma_fence_wait_timeout(struct dma_fence *fence, bool intr, long timeout)
@@ -825,7 +825,7 @@ dma_fence_wait_timeout(struct dma_fence
KASSERT(dma_fence_referenced_p(fence));
KASSERTMSG(timeout >= 0, "timeout %ld", timeout);
- KASSERTMSG(timeout < MAX_SCHEDULE_TIMEOUT, "timeout %ld", timeout);
+ KASSERTMSG(timeout <= MAX_SCHEDULE_TIMEOUT, "timeout %ld", timeout);
if (fence->ops->wait)
return (*fence->ops->wait)(fence, intr, timeout);
