Module Name: src
Committed By: riastradh
Date: Sun Dec 19 10:38:46 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:
First approximation of dma_fence_get_stub.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/include/linux/dma-fence.h
cvs rdiff -u -r1.8 -r1.9 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.7 src/sys/external/bsd/drm2/include/linux/dma-fence.h:1.8
--- src/sys/external/bsd/drm2/include/linux/dma-fence.h:1.7 Sun Dec 19 01:48:22 2021
+++ src/sys/external/bsd/drm2/include/linux/dma-fence.h Sun Dec 19 10:38:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dma-fence.h,v 1.7 2021/12/19 01:48:22 riastradh Exp $ */
+/* $NetBSD: dma-fence.h,v 1.8 2021/12/19 10:38:46 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -87,6 +87,7 @@ struct dma_fence_cb {
#define dma_fence_get linux_dma_fence_get
#define dma_fence_get_rcu linux_dma_fence_get_rcu
#define dma_fence_get_rcu_safe linux_dma_fence_get_rcu_safe
+#define dma_fence_get_stub linux_dma_fence_get_stub
#define dma_fence_init linux_dma_fence_init
#define dma_fence_is_later linux_dma_fence_is_later
#define dma_fence_is_signaled linux_dma_fence_is_signaled
@@ -112,6 +113,9 @@ unsigned
bool dma_fence_is_later(struct dma_fence *, struct dma_fence *);
struct dma_fence *
+ dma_fence_get_stub(void);
+
+struct dma_fence *
dma_fence_get(struct dma_fence *);
struct dma_fence *
dma_fence_get_rcu(struct dma_fence *);
Index: src/sys/external/bsd/drm2/linux/linux_dma_fence.c
diff -u src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.8 src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.9
--- src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.8 Sun Dec 19 01:50:40 2021
+++ src/sys/external/bsd/drm2/linux/linux_dma_fence.c Sun Dec 19 10:38:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_dma_fence.c,v 1.8 2021/12/19 01:50:40 riastradh Exp $ */
+/* $NetBSD: linux_dma_fence.c,v 1.9 2021/12/19 10:38:46 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.8 2021/12/19 01:50:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_dma_fence.c,v 1.9 2021/12/19 10:38:46 riastradh Exp $");
#include <sys/atomic.h>
#include <sys/condvar.h>
@@ -171,6 +171,28 @@ dma_fence_is_later(struct dma_fence *a,
}
/*
+ * dma_fence_get_stub()
+ *
+ * Return a dma fence that is always already signalled.
+ */
+struct dma_fence *
+dma_fence_get_stub(void)
+{
+ /*
+ * XXX This probably isn't good enough -- caller may try
+ * operations on this that require the lock, which will
+ * require us to create and destroy the lock on module
+ * load/unload.
+ */
+ static struct dma_fence fence = {
+ .refcount = {1}, /* always referenced */
+ .flags = 1u << DMA_FENCE_FLAG_SIGNALED_BIT,
+ };
+
+ return dma_fence_get(&fence);
+}
+
+/*
* dma_fence_get(fence)
*
* Acquire a reference to fence. The fence must not be being
