Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:06:38 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.c
Log Message:
Missed a missed_irq.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.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_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.39 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.40
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.39 Mon Aug 27 07:05:50 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Mon Aug 27 07:06:38 2018
@@ -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 @@ int __i915_wait_request(struct drm_i915_
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);
