diff options
| author | riastradh <riastradh@NetBSD.org> | 2021-12-19 12:38:33 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2021-12-19 12:38:33 +0000 |
| commit | 317cc838d6415d3e5a8231cc2bbfa1c1d080b213 (patch) | |
| tree | 5943b0bc2c71a10cd7335755b3017b3d33bd1d71 /sys/external | |
| parent | 77169745fceb6490c061a733d018ad4ecc34e21f (diff) | |
drm: Make sure dma_fence_wait gets traced too. Deduplicate.
Diffstat (limited to 'sys/external')
| -rw-r--r-- | sys/external/bsd/drm2/linux/linux_dma_fence.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/external/bsd/drm2/linux/linux_dma_fence.c b/sys/external/bsd/drm2/linux/linux_dma_fence.c index 6832367d7f8..3ee33d32b76 100644 --- a/sys/external/bsd/drm2/linux/linux_dma_fence.c +++ b/sys/external/bsd/drm2/linux/linux_dma_fence.c @@ -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, bool intr) 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); |
