Module Name: src
Committed By: riastradh
Date: Sun Dec 19 00:55:43 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_atomic_helper.c
Log Message:
Sync access path to vblank count in wait loop.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
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.7 src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c:1.7 Sun Dec 19 00:50:01 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c Sun Dec 19 00:55:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_atomic_helper.c,v 1.7 2021/12/19 00:50:01 riastradh Exp $ */
+/* $NetBSD: drm_atomic_helper.c,v 1.8 2021/12/19 00:55:43 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.7 2021/12/19 00:50:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_atomic_helper.c,v 1.8 2021/12/19 00:55:43 riastradh Exp $");
#include <linux/dma-fence.h>
#include <linux/ktime.h>
@@ -1469,7 +1469,7 @@ drm_atomic_helper_wait_for_vblanks(struc
spin_lock(&dev->vbl_lock);
DRM_SPIN_WAIT_ON(ret, &dev->vblank[i].queue, &dev->vbl_lock,
msecs_to_jiffies(50),
- (old_crtc_state->last_vblank_count !=
+ (old_state->crtcs[i].last_vblank_count !=
drm_crtc_vblank_count(crtc)));
spin_unlock(&dev->vbl_lock);
#else
