Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:36:32 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_vblank.c
Log Message:
drm: Must hold event_lock around wait on event_queue.
We must not have hit this path before if it never crashed!
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/dist/drm/drm_vblank.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_vblank.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_vblank.c:1.14 src/sys/external/bsd/drm2/dist/drm/drm_vblank.c:1.15
--- src/sys/external/bsd/drm2/dist/drm/drm_vblank.c:1.14 Sun Dec 19 12:32:01 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_vblank.c Sun Dec 19 12:36:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_vblank.c,v 1.14 2021/12/19 12:32:01 riastradh Exp $ */
+/* $NetBSD: drm_vblank.c,v 1.15 2021/12/19 12:36:31 riastradh Exp $ */
/*
* drm_irq.c IRQ and vblank support
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_vblank.c,v 1.14 2021/12/19 12:32:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_vblank.c,v 1.15 2021/12/19 12:36:31 riastradh Exp $");
#include <linux/export.h>
#include <linux/moduleparam.h>
@@ -1787,10 +1787,12 @@ int drm_wait_vblank_ioctl(struct drm_dev
DRM_DEBUG("waiting on vblank count %"PRIu64", crtc %u\n",
req_seq, pipe);
+ spin_lock(&dev->event_lock);
DRM_SPIN_TIMED_WAIT_UNTIL(wait, &vblank->queue,
&dev->event_lock, msecs_to_jiffies(3000),
(vblank_passed(drm_vblank_count(dev, pipe), req_seq) ||
!READ_ONCE(vblank->enabled)));
+ spin_unlock(&dev->event_lock);
switch (wait) {
case 0:
