[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Match linux here and wai...

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

details:   https://anonhg.NetBSD.org/src/rev/382137670140
branches:  trunk
changeset: 956457:382137670140
user:      maya <maya%NetBSD.org@localhost>
date:      Sat Oct 31 04:05:42 2020 +0000

description:
Match linux here and wait without interrupts.

>From David H. Gutteridge in PR port-amd64/55555
There's a second part to the patch, but "make our code behave the way
the upstream code does" is very welcome.
Also PR kern/54515 and possibly others.

diffstat:

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

diffs (27 lines):

diff -r 4240cfeb5ab1 -r 382137670140 sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c        Sat Oct 31 01:08:31 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c        Sat Oct 31 04:05:42 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_sprite.c,v 1.10 2020/02/14 04:36:12 riastradh Exp $      */
+/*     $NetBSD: intel_sprite.c,v 1.11 2020/10/31 04:05:42 maya Exp $   */
 
 /*
  * Copyright © 2011 Intel Corporation
@@ -32,7 +32,7 @@
  * support.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_sprite.c,v 1.10 2020/02/14 04:36:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_sprite.c,v 1.11 2020/10/31 04:05:42 maya Exp $");
 
 #include <drm/drmP.h>
 #include <drm/drm_crtc.h>
@@ -124,7 +124,7 @@
        trace_i915_pipe_update_start(crtc);
 
 #ifdef __NetBSD__
-       DRM_SPIN_TIMED_WAIT_UNTIL(ret, wq, &dev->vbl_lock, timeout,
+       DRM_SPIN_TIMED_WAIT_NOINTR_UNTIL(ret, wq, &dev->vbl_lock, timeout,
            (scanline = intel_get_crtc_scanline(crtc),
                scanline < min || scanline > max));
        if (ret <= 0)