Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:34:34 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_request.c
Log Message:
i915: Fix locking-against-self in i915_request_wait.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
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.11 src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c:1.11 Sun Dec 19 12:09:09 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c Sun Dec 19 12:34:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_request.c,v 1.11 2021/12/19 12:09:09 riastradh Exp $ */
+/* $NetBSD: i915_request.c,v 1.12 2021/12/19 12:34:34 riastradh Exp $ */
/*
* Copyright © 2008-2015 Intel Corporation
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_request.c,v 1.11 2021/12/19 12:09:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_request.c,v 1.12 2021/12/19 12:34:34 riastradh Exp $");
#include <linux/dma-fence-array.h>
#include <linux/irq_work.h>
@@ -1613,7 +1613,10 @@ long i915_request_wait(struct i915_reque
goto out;
spin_lock(rq->fence.lock);
#define C (i915_request_completed(rq) ? 1 : \
- (intel_engine_flush_submission(rq->engine), 0))
+ (spin_unlock(rq->fence.lock), \
+ intel_engine_flush_submission(rq->engine), \
+ spin_lock(rq->fence.lock), \
+ i915_request_completed(rq)))
if (flags & I915_WAIT_INTERRUPTIBLE) {
DRM_SPIN_TIMED_WAIT_UNTIL(timeout, &wait.wq,
rq->fence.lock, timeout,
