[src/trunk]: src/sys/external/bsd/drm2/linux drm: Make sure dma_fence_wait ge...

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

details:   https://anonhg.NetBSD.org/src/rev/c9bc7e76a963
branches:  trunk
changeset: 1028983:c9bc7e76a963
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 12:38:33 2021 +0000

description:
drm: Make sure dma_fence_wait gets traced too.  Deduplicate.

diffstat:

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

diffs (31 lines):

diff -r 1d893db863d7 -r c9bc7e76a963 sys/external/bsd/drm2/linux/linux_dma_fence.c
--- a/sys/external/bsd/drm2/linux/linux_dma_fence.c     Sun Dec 19 12:38:24 2021 +0000
+++ b/sys/external/bsd/drm2/linux/linux_dma_fence.c     Sun Dec 19 12:38:33 2021 +0000
@@ -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 @@
 
        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);