Module Name: src
Committed By: riastradh
Date: Mon Dec 20 00:27:42 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_atomic_helper.c
Log Message:
drm: Fix return code interpretation in timed wait loop.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.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/drm_atomic_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c:1.10 src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c:1.10 Sun Dec 19 12:43:52 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c Mon Dec 20 00:27:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_atomic_helper.c,v 1.10 2021/12/19 12:43:52 riastradh Exp $ */
+/* $NetBSD: drm_atomic_helper.c,v 1.11 2021/12/20 00:27:42 riastradh Exp $ */
/*
* Copyright (C) 2014 Red Hat
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_atomic_helper.c,v 1.10 2021/12/19 12:43:52 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_atomic_helper.c,v 1.11 2021/12/20 00:27:42 riastradh Exp $");
#include <linux/dma-fence.h>
#include <linux/ktime.h>
@@ -1467,20 +1467,20 @@ drm_atomic_helper_wait_for_vblanks(struc
#ifdef __NetBSD__
if (cold) {
- unsigned timo = 100;
+ bool done = false;
- ret = -ETIMEDOUT;
- while (timo --> 0 && ret) {
+ ret = 100;
+ for (ret = 100; !done && ret; DELAY(1000), ret--) {
spin_lock(&dev->event_lock);
if (old_state->crtcs[i].last_vblank_count !=
drm_crtc_vblank_count(crtc)) {
- ret = 0;
+ done = true;
}
spin_unlock(&dev->event_lock);
}
} else {
spin_lock(&dev->event_lock);
- DRM_SPIN_WAIT_ON(ret, &dev->vblank[i].queue,
+ DRM_SPIN_TIMED_WAIT_UNTIL(ret, &dev->vblank[i].queue,
&dev->event_lock,
msecs_to_jiffies(100),
(old_state->crtcs[i].last_vblank_count !=
