Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:58:33 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_request.c
Log Message:
i915: Use dma_fence_signal_locked when we already hold the lock.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
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.5 src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c:1.5 Sun Dec 19 11:36:17 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c Sun Dec 19 11:58:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_request.c,v 1.5 2021/12/19 11:36:17 riastradh Exp $ */
+/* $NetBSD: i915_request.c,v 1.6 2021/12/19 11:58:32 riastradh Exp $ */
/*
* Copyright © 2008-2015 Intel Corporation
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_request.c,v 1.5 2021/12/19 11:36:17 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_request.c,v 1.6 2021/12/19 11:58:32 riastradh Exp $");
#include <linux/dma-fence-array.h>
#include <linux/irq_work.h>
@@ -1607,7 +1607,7 @@ long i915_request_wait(struct i915_reque
i915_request_completed(rq));
}
if (timeout > 0) /* succeeded before timeout */
- dma_fence_signal(&rq->fence);
+ dma_fence_signal_locked(&rq->fence);
spin_unlock(rq->fence.lock);
DRM_DESTROY_WAITQUEUE(&wait.wq);
#else
