Sat Oct 31 04:05:42 2020 UTC ()
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.


(maya)
diff -r1.10 -r1.11 src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c

cvs diff -r1.10 -r1.11 src/sys/external/bsd/drm2/dist/drm/i915/Attic/intel_sprite.c (expand / switch to context diff)
--- src/sys/external/bsd/drm2/dist/drm/i915/Attic/intel_sprite.c 2020/02/14 04:36:12 1.10
+++ src/sys/external/bsd/drm2/dist/drm/i915/Attic/intel_sprite.c 2020/10/31 04:05:42 1.11
@@ -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)