Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:38:06 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/linux: linux_dma_fence.c
Log Message:
drm: Fix signalling return value if no enable_signaling op.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 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/linux/linux_dma_fence.c
diff -u src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.34 src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.35
--- src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.34 Sun Dec 19 12:35:21 2021
+++ src/sys/external/bsd/drm2/linux/linux_dma_fence.c Sun Dec 19 12:38:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_dma_fence.c,v 1.34 2021/12/19 12:35:21 riastradh Exp $ */
+/* $NetBSD: linux_dma_fence.c,v 1.35 2021/12/19 12:38:06 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.34 2021/12/19 12:35:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_dma_fence.c,v 1.35 2021/12/19 12:38:06 riastradh Exp $");
#include <sys/atomic.h>
#include <sys/condvar.h>
@@ -406,16 +406,14 @@ dma_fence_ensure_signal_enabled(struct d
/*
* Otherwise, if it wasn't enabled yet, try to enable
- * signalling, or fail if the fence doesn't support that.
+ * signalling.
*/
- if (!already_enabled) {
- if (fence->ops->enable_signaling == NULL)
- return -ENOENT;
- if (!(*fence->ops->enable_signaling)(fence)) {
- /* If it failed, signal and return -ENOENT. */
- dma_fence_signal_locked(fence);
- return -ENOENT;
- }
+ if (!already_enabled &&
+ fence->ops->enable_signaling &&
+ !(*fence->ops->enable_signaling)(fence)) {
+ /* If it failed, signal and return -ENOENT. */
+ dma_fence_signal_locked(fence);
+ return -ENOENT;
}
/* Success! */
