[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 i915: Defer destroying w...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6ee8a0d068ce
branches:  trunk
changeset: 368443:6ee8a0d068ce
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Jul 11 18:56:00 2022 +0000

description:
i915: Defer destroying waitqueue until after callback is removed.

Candidate fix for PR kern/56561.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_request.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 7a380afe35df -r 6ee8a0d068ce sys/external/bsd/drm2/dist/drm/i915/i915_request.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_request.c        Mon Jul 11 15:12:24 2022 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_request.c        Mon Jul 11 18:56:00 2022 +0000
@@ -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 @@
                timeout = -ETIME;
        }
        spin_unlock(rq->fence.lock);
-       DRM_DESTROY_WAITQUEUE(&wait.wq);
 #else
        for (;;) {
                set_current_state(state);
@@ -1657,6 +1656,9 @@
 #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_);