Module Name: src
Committed By: martin
Date: Sun Nov 29 11:34:04 UTC 2020
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [netbsd-9]: intel_sprite.c
Log Message:
Pull up following revision(s) (requested by maya in ticket #1136):
sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c: revision 1.11
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.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.4.1 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.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/intel_sprite.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c:1.9 src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c:1.9.4.1
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c:1.9 Mon Aug 27 15:09:35 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c Sun Nov 29 11:34:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_sprite.c,v 1.9 2018/08/27 15:09:35 riastradh Exp $ */
+/* $NetBSD: intel_sprite.c,v 1.9.4.1 2020/11/29 11:34:04 martin Exp $ */
/*
* Copyright © 2011 Intel Corporation
@@ -32,7 +32,7 @@
* support.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_sprite.c,v 1.9 2018/08/27 15:09:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_sprite.c,v 1.9.4.1 2020/11/29 11:34:04 martin Exp $");
#include <drm/drmP.h>
#include <drm/drm_crtc.h>
@@ -124,7 +124,7 @@ void intel_pipe_update_start(struct inte
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)
