Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-9]: src/sys/external/bsd/drm2/dist/drm/i915 Pull up following rev...
details: https://anonhg.NetBSD.org/src/rev/5c534633fce7
branches: netbsd-9
changeset: 946512:5c534633fce7
user: martin <martin%NetBSD.org@localhost>
date: Sun Nov 29 11:34:04 2020 +0000
description:
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.
diffstat:
sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (27 lines):
diff -r c0758562ecff -r 5c534633fce7 sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c Sun Nov 29 11:25:31 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c Sun Nov 29 11:34:04 2020 +0000
@@ -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 @@
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)
Home |
Main Index |
Thread Index |
Old Index