Module Name: src
Committed By: riastradh
Date: Mon Dec 27 13:28:52 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_request.c
Log Message:
i915: Omit diff now that TASK_INTERRUPTIBLE is defined.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
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.13 src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c:1.14
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c:1.13 Tue Dec 21 19:07:09 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c Mon Dec 27 13:28:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_request.c,v 1.13 2021/12/21 19:07:09 thorpej Exp $ */
+/* $NetBSD: i915_request.c,v 1.14 2021/12/27 13:28:52 riastradh Exp $ */
/*
* Copyright © 2008-2015 Intel Corporation
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_request.c,v 1.13 2021/12/21 19:07:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_request.c,v 1.14 2021/12/27 13:28:52 riastradh Exp $");
#include <linux/dma-fence-array.h>
#include <linux/irq_work.h>
@@ -1528,12 +1528,8 @@ long i915_request_wait(struct i915_reque
unsigned int flags,
long timeout)
{
-#ifdef __NetBSD__
- const int state = 0;
-#else
const int state = flags & I915_WAIT_INTERRUPTIBLE ?
TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE;
-#endif
struct request_wait wait;
might_sleep();
