[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Missed a missed_irq.

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

details:   https://anonhg.NetBSD.org/src/rev/39f38c21f1a2
branches:  trunk
changeset: 365884:39f38c21f1a2
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:06:38 2018 +0000

description:
Missed a missed_irq.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 11ff2ba31ce3 -r 39f38c21f1a2 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Mon Aug 27 07:06:25 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Mon Aug 27 07:06:38 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_gem.c,v 1.39 2018/08/27 07:05:50 riastradh Exp $  */
+/*     $NetBSD: i915_gem.c,v 1.40 2018/08/27 07:06:38 riastradh Exp $  */
 
 /*
  * Copyright © 2008-2015 Intel Corporation
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.39 2018/08/27 07:05:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.40 2018/08/27 07:06:38 riastradh Exp $");
 
 #ifdef __NetBSD__
 #if 0                          /* XXX uvmhist option?  */
@@ -1482,7 +1482,8 @@
                atomic_read(&dev_priv->gpu_error.reset_counter))) ||          \
            i915_gem_request_completed(req, false))
        if (timeout) {
-               int ticks = nsecs_to_jiffies_timeout(*timeout);
+               int ticks = missed_irq(dev_priv, ring) ? 1 :
+                   nsecs_to_jiffies_timeout(*timeout);
                if (interruptible) {
                        DRM_SPIN_TIMED_WAIT_UNTIL(ret, &ring->irq_queue,
                            &dev_priv->irq_lock, ticks, EXIT_COND);