[src/trunk]: src/sys/external/bsd/drm2/linux Linux wants to violate abstracti...

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

details:   https://anonhg.NetBSD.org/src/rev/6d4fd977e510
branches:  trunk
changeset: 1027916:6d4fd977e510
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 01:16:05 2021 +0000

description:
Linux wants to violate abstractions, so fine, let them.

diffstat:

 sys/external/bsd/drm2/include/linux/dma-fence.h |  4 ++--
 sys/external/bsd/drm2/linux/linux_dma_fence.c   |  8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r d7f446050de7 -r 6d4fd977e510 sys/external/bsd/drm2/include/linux/dma-fence.h
--- a/sys/external/bsd/drm2/include/linux/dma-fence.h   Sun Dec 19 01:15:56 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/dma-fence.h   Sun Dec 19 01:16:05 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dma-fence.h,v 1.3 2021/12/19 01:15:28 riastradh Exp $  */
+/*     $NetBSD: dma-fence.h,v 1.4 2021/12/19 01:16:05 riastradh Exp $  */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
 typedef void (*dma_fence_func_t)(struct dma_fence *, struct dma_fence_cb *);
 
 struct dma_fence_cb {
-       dma_fence_func_t                fcb_func;
+       dma_fence_func_t                func; /* Linux API name */
        TAILQ_ENTRY(dma_fence_cb)       fcb_entry;
        bool                            fcb_onqueue;
 };
diff -r d7f446050de7 -r 6d4fd977e510 sys/external/bsd/drm2/linux/linux_dma_fence.c
--- a/sys/external/bsd/drm2/linux/linux_dma_fence.c     Sun Dec 19 01:15:56 2021 +0000
+++ b/sys/external/bsd/drm2/linux/linux_dma_fence.c     Sun Dec 19 01:16:05 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_dma_fence.c,v 1.3 2021/12/19 01:15:28 riastradh Exp $    */
+/*     $NetBSD: linux_dma_fence.c,v 1.4 2021/12/19 01:16:05 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.3 2021/12/19 01:15:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_dma_fence.c,v 1.4 2021/12/19 01:16:05 riastradh Exp $");
 
 #include <sys/atomic.h>
 #include <sys/condvar.h>
@@ -352,7 +352,7 @@
                goto out1;
 
        /* Insert the callback.  */
-       fcb->fcb_func = fn;
+       fcb->func = fn;
        TAILQ_INSERT_TAIL(&fence->f_callbacks, fcb, fcb_entry);
        fcb->fcb_onqueue = true;
 
@@ -510,7 +510,7 @@
        TAILQ_FOREACH_SAFE(fcb, &fence->f_callbacks, fcb_entry, next) {
                TAILQ_REMOVE(&fence->f_callbacks, fcb, fcb_entry);
                fcb->fcb_onqueue = false;
-               (*fcb->fcb_func)(fence, fcb);
+               (*fcb->func)(fence, fcb);
        }
 
        /* Success! */