Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:38:34 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/linux: linux_dma_fence.c
Log Message:
drm: Make sure dma_fence_wait gets traced too. Deduplicate.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 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.36 src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.37
--- src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.36 Sun Dec 19 12:38:15 2021
+++ src/sys/external/bsd/drm2/linux/linux_dma_fence.c Sun Dec 19 12:38:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_dma_fence.c,v 1.36 2021/12/19 12:38:15 riastradh Exp $ */
+/* $NetBSD: linux_dma_fence.c,v 1.37 2021/12/19 12:38:33 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.36 2021/12/19 12:38:15 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_dma_fence.c,v 1.37 2021/12/19 12:38:33 riastradh Exp $");
#include <sys/atomic.h>
#include <sys/condvar.h>
@@ -965,11 +965,7 @@ dma_fence_wait(struct dma_fence *fence,
KASSERT(dma_fence_referenced_p(fence));
- if (fence->ops->wait)
- ret = (*fence->ops->wait)(fence, intr, MAX_SCHEDULE_TIMEOUT);
- else
- ret = dma_fence_default_wait(fence, intr,
- MAX_SCHEDULE_TIMEOUT);
+ ret = dma_fence_wait_timeout(fence, intr, MAX_SCHEDULE_TIMEOUT);
KASSERT(ret != 0);
KASSERTMSG(ret == -ERESTARTSYS || ret == MAX_SCHEDULE_TIMEOUT,
"ret=%ld", ret);
