Module Name: src
Committed By: riastradh
Date: Mon Dec 27 13:29:15 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_request.c
Log Message:
i915: Fix timeout return value of i915_request_wait.
For some reason this returns ETIME, not ETIMEDOUT or 0 like most
other wait-with-timeout things in Linux.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
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.15 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.15 Mon Dec 27 13:29:04 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c Mon Dec 27 13:29:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_request.c,v 1.15 2021/12/27 13:29:04 riastradh Exp $ */
+/* $NetBSD: i915_request.c,v 1.16 2021/12/27 13:29:15 riastradh Exp $ */
/*
* Copyright © 2008-2015 Intel Corporation
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_request.c,v 1.15 2021/12/27 13:29:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_request.c,v 1.16 2021/12/27 13:29:15 riastradh Exp $");
#include <linux/dma-fence-array.h>
#include <linux/irq_work.h>
@@ -1623,8 +1623,12 @@ long i915_request_wait(struct i915_reque
C);
}
#undef C
- if (timeout > 0) /* succeeded before timeout */
+ if (timeout > 0) { /* succeeded before timeout */
+ KASSERT(i915_request_completed(rq));
dma_fence_signal_locked(&rq->fence);
+ } else if (timeout == 0) { /* timed out */
+ timeout = -ETIME;
+ }
spin_unlock(rq->fence.lock);
DRM_DESTROY_WAITQUEUE(&wait.wq);
#else
