Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i915: Defer destroying waitqueue until after callback is removed. 

Candidate fix for PR kern/56561.
This commit is contained in:
riastradh 2022-07-11 18:56:00 +00:00
parent 54eba5c35d
commit 5f6c4afe88
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/external/bsd/drm2/dist/drm/i915/i915_request.c vendored
View File

@ -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_request *rq,
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_request *rq,
#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_);