Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:09:20 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/linux: linux_dma_fence.c
Log Message:
drm: Ensure the fence callback is initialized on failure.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 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.20 src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.21
--- src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.20 Sun Dec 19 12:07:38 2021
+++ src/sys/external/bsd/drm2/linux/linux_dma_fence.c Sun Dec 19 12:09:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_dma_fence.c,v 1.20 2021/12/19 12:07:38 riastradh Exp $ */
+/* $NetBSD: linux_dma_fence.c,v 1.21 2021/12/19 12:09:19 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.20 2021/12/19 12:07:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_dma_fence.c,v 1.21 2021/12/19 12:09:19 riastradh Exp $");
#include <sys/atomic.h>
#include <sys/condvar.h>
@@ -413,10 +413,15 @@ dma_fence_add_callback(struct dma_fence
fcb->func = fn;
TAILQ_INSERT_TAIL(&fence->f_callbacks, fcb, fcb_entry);
fcb->fcb_onqueue = true;
+ ret = 0;
/* Release the lock and we're done. */
out1: spin_unlock(fence->lock);
-out0: return ret;
+out0: if (ret) {
+ fcb->func = NULL;
+ fcb->fcb_onqueue = false;
+ }
+ return ret;
}
/*
