Module Name: src
Committed By: riastradh
Date: Sun Dec 19 01:16:05 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: dma-fence.h
src/sys/external/bsd/drm2/linux: linux_dma_fence.c
Log Message:
Linux wants to violate abstractions, so fine, let them.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/include/linux/dma-fence.h
cvs rdiff -u -r1.3 -r1.4 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/include/linux/dma-fence.h
diff -u src/sys/external/bsd/drm2/include/linux/dma-fence.h:1.3 src/sys/external/bsd/drm2/include/linux/dma-fence.h:1.4
--- src/sys/external/bsd/drm2/include/linux/dma-fence.h:1.3 Sun Dec 19 01:15:28 2021
+++ src/sys/external/bsd/drm2/include/linux/dma-fence.h Sun Dec 19 01:16:05 2021
@@ -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 @@ struct dma_fence_ops {
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;
};
Index: src/sys/external/bsd/drm2/linux/linux_dma_fence.c
diff -u src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.3 src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.4
--- src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.3 Sun Dec 19 01:15:28 2021
+++ src/sys/external/bsd/drm2/linux/linux_dma_fence.c Sun Dec 19 01:16:05 2021
@@ -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 @@ dma_fence_add_callback(struct dma_fence
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 @@ dma_fence_signal_locked(struct dma_fence
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! */
