[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 i915: Omit diff now that...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0653d71ccf2b
branches:  trunk
changeset: 1029203:0653d71ccf2b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Dec 27 13:28:52 2021 +0000

description:
i915: Omit diff now that TASK_INTERRUPTIBLE is defined.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_request.c |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (31 lines):

diff -r 0696f0bc4d16 -r 0653d71ccf2b sys/external/bsd/drm2/dist/drm/i915/i915_request.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_request.c        Mon Dec 27 13:28:41 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_request.c        Mon Dec 27 13:28:52 2021 +0000
@@ -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 @@
                       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();