Module Name: src
Committed By: riastradh
Date: Mon Jul 11 18:56:00 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_request.c
Log Message:
i915: Defer destroying waitqueue until after callback is removed.
Candidate fix for PR kern/56561.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_request.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/dist/drm/i915/i915_request.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c:1.16 src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c:1.17
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c:1.16 Mon Dec 27 13:29:15 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c Mon Jul 11 18:56:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_request.c,v 1.16 2021/12/27 13:29:15 riastradh Exp $ */
+/* $NetBSD: i915_request.c,v 1.17 2022/07/11 18:56:00 riastradh Exp $ */
/*
* Copyright © 2008-2015 Intel Corporation
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_request.c,v 1.16 2021/12/27 13:29:15 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_request.c,v 1.17 2022/07/11 18:56:00 riastradh Exp $");
#include <linux/dma-fence-array.h>
#include <linux/irq_work.h>
@@ -1630,7 +1630,6 @@ long i915_request_wait(struct i915_reque
timeout = -ETIME;
}
spin_unlock(rq->fence.lock);
- DRM_DESTROY_WAITQUEUE(&wait.wq);
#else
for (;;) {
set_current_state(state);
@@ -1657,6 +1656,9 @@ long i915_request_wait(struct i915_reque
#endif
dma_fence_remove_callback(&rq->fence, &wait.cb);
+#ifdef __NetBSD__
+ DRM_DESTROY_WAITQUEUE(&wait.wq);
+#endif
out:
mutex_release(&rq->engine->gt->reset.mutex.dep_map, _THIS_IP_);
