Module Name: src
Committed By: riastradh
Date: Sun Dec 19 10:50:03 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:
dma_fence_get_status
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/include/linux/dma-fence.h
cvs rdiff -u -r1.9 -r1.10 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.9 src/sys/external/bsd/drm2/include/linux/dma-fence.h:1.10
--- src/sys/external/bsd/drm2/include/linux/dma-fence.h:1.9 Sun Dec 19 10:40:12 2021
+++ src/sys/external/bsd/drm2/include/linux/dma-fence.h Sun Dec 19 10:50:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dma-fence.h,v 1.9 2021/12/19 10:40:12 riastradh Exp $ */
+/* $NetBSD: dma-fence.h,v 1.10 2021/12/19 10:50:03 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -89,6 +89,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_status linux_dma_fence_get_status
#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
@@ -133,6 +134,7 @@ void dma_fence_enable_sw_signaling(struc
bool dma_fence_is_signaled(struct dma_fence *);
bool dma_fence_is_signaled_locked(struct dma_fence *);
void dma_fence_set_error(struct dma_fence *, int);
+int dma_fence_get_status(struct dma_fence *);
int dma_fence_signal(struct dma_fence *);
int dma_fence_signal_locked(struct dma_fence *);
long dma_fence_default_wait(struct dma_fence *, bool, long);
Index: src/sys/external/bsd/drm2/linux/linux_dma_fence.c
diff -u src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.9 src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.10
--- src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.9 Sun Dec 19 10:38:46 2021
+++ src/sys/external/bsd/drm2/linux/linux_dma_fence.c Sun Dec 19 10:50:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_dma_fence.c,v 1.9 2021/12/19 10:38:46 riastradh Exp $ */
+/* $NetBSD: linux_dma_fence.c,v 1.10 2021/12/19 10:50:03 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.9 2021/12/19 10:38:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_dma_fence.c,v 1.10 2021/12/19 10:50:03 riastradh Exp $");
#include <sys/atomic.h>
#include <sys/condvar.h>
@@ -503,6 +503,32 @@ dma_fence_set_error(struct dma_fence *fe
}
/*
+ * dma_fence_get_status(fence)
+ *
+ * Return 0 if fence has yet to be signalled, 1 if it has been
+ * signalled without error, or negative error code if
+ * dma_fence_set_error was used.
+ */
+int
+dma_fence_get_status(struct dma_fence *fence)
+{
+ int ret;
+
+ spin_lock(fence->lock);
+ if (!dma_fence_is_signaled_locked(fence)) {
+ ret = 0;
+ } else if (fence->error) {
+ ret = fence->error;
+ KASSERTMSG(ret < 0, "%d", ret);
+ } else {
+ ret = 1;
+ }
+ spin_unlock(fence->lock);
+
+ return ret;
+}
+
+/*
* dma_fence_signal(fence)
*
* Signal the fence. If it has already been signalled, return
