Module Name: src
Committed By: riastradh
Date: Mon Aug 27 14:43:00 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_sprite.c
Log Message:
Fix intel pipe update locking and whining.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
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.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c:1.7 Mon Aug 27 07:28:26 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c Mon Aug 27 14:43:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_sprite.c,v 1.7 2018/08/27 07:28:26 riastradh Exp $ */
+/* $NetBSD: intel_sprite.c,v 1.8 2018/08/27 14:43:00 riastradh Exp $ */
/*
* Copyright © 2011 Intel Corporation
@@ -32,7 +32,7 @@
* support.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_sprite.c,v 1.7 2018/08/27 07:28:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_sprite.c,v 1.8 2018/08/27 14:43:00 riastradh Exp $");
#include <drm/drmP.h>
#include <drm/drm_crtc.h>
@@ -115,7 +115,7 @@ void intel_pipe_update_start(struct inte
if (min <= 0 || max <= 0)
return;
- if (WARN_ON(drm_crtc_vblank_get(&crtc->base)))
+ if (WARN_ON(drm_crtc_vblank_get_locked(&crtc->base)))
return;
crtc->debug.min_vbl = min;
@@ -126,9 +126,10 @@ void intel_pipe_update_start(struct inte
DRM_SPIN_TIMED_WAIT_UNTIL(ret, wq, &dev->vbl_lock, timeout,
(scanline = intel_get_crtc_scanline(crtc),
scanline < min || scanline > max));
- if (ret)
- DRM_ERROR("Potential atomic update failure on pipe %c\n",
- pipe_name(crtc->pipe));
+ if (ret <= 0)
+ DRM_ERROR("Potential atomic update failure on pipe %c: %d\n",
+ pipe_name(crtc->pipe), ret ? ret : -EWOULDBLOCK);
+ drm_crtc_vblank_put_locked(&crtc->base);
#else
for (;;) {
/*
@@ -156,9 +157,9 @@ void intel_pipe_update_start(struct inte
}
finish_wait(wq, &wait);
-#endif
drm_crtc_vblank_put(&crtc->base);
+#endif
crtc->debug.scanline_start = scanline;
crtc->debug.start_vbl_time = ktime_get();
